[tor/master] Merge branch 'bug8787_squashed'

commit c0441cca8b483882f5676b98081f0fe4b52d3ae1 Merge: 4ebad0d 3118af2 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 31 11:57:56 2014 -0400 Merge branch 'bug8787_squashed' changes/bug8787 | 5 +++ src/common/compat.c | 85 ++++++++++++++++++++++++++++++++++++++++-------- src/common/compat.h | 2 +- src/common/tortls.c | 17 +++++++--- src/common/util.c | 9 ++++- src/or/config.c | 5 ++- src/or/hibernate.c | 10 +++++- src/or/main.c | 17 +++++++--- src/or/microdesc.c | 21 +++++++++--- src/or/networkstatus.c | 21 +++++++++--- src/or/routerlist.c | 34 ++++++++++++++----- src/or/statefile.c | 10 ++++-- src/test/test_util.c | 11 +++---- 13 files changed, 197 insertions(+), 50 deletions(-)
participants (1)
-
nickm@torproject.org