commit 882e0fbd76b9b56b943680a310d16fc94ab07438 Merge: b3534df e202f3a Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 23 07:25:12 2016 -0500 Merge branch 'bug17795' src/common/crypto.c | 28 +++++++--------------------- src/common/crypto.h | 12 +++++++----- src/common/tortls.c | 8 ++++---- src/common/tortls.h | 10 ++++++---- src/or/channeltls.c | 5 +++-- src/or/connection_or.c | 2 +- src/or/dirserv.c | 4 ++-- src/or/dirserv.h | 6 +++--- src/or/dirvote.c | 2 +- src/or/networkstatus.c | 2 +- src/or/or.h | 4 ++-- src/or/routerkeys.c | 4 ++-- src/or/routerparse.c | 25 +++++++++++++------------ src/or/routerparse.h | 3 ++- src/test/test_crypto.c | 4 ++-- src/test/test_dir.c | 12 +++++++----- src/test/test_dir_handle_get.c | 2 +- src/test/test_tortls.c | 6 +++--- 18 files changed, 67 insertions(+), 72 deletions(-)