commit fcdec00685608c85161116bdb7408f33094ea3fa Merge: 94dce246e 9c17a6d28 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 17 09:59:26 2017 -0500

Merge branch 'maint-0.3.2'

changes/bug23817 | 3 + src/or/directory.c | 82 ++++++++----------------- src/or/directory.h | 44 ++++++++++++++ src/or/entrynodes.c | 121 +++++++++++++++++++++++++++++++++---- src/or/entrynodes.h | 33 +++++++--- src/or/microdesc.c | 101 +++++++++++++++++++++++++++++++ src/or/microdesc.h | 4 ++ src/or/networkstatus.c | 3 + src/or/scheduler.c | 7 ++- src/test/test_entrynodes.c | 146 +++++++++++++++++++++++++++++++++++++++------ 10 files changed, 447 insertions(+), 97 deletions(-)

diff --cc src/or/directory.h index 904bdfae4,5e6a91d3e..3aef60071 --- a/src/or/directory.h +++ b/src/or/directory.h @@@ -193,10 -235,9 +235,12 @@@ STATIC void warn_disallowed_anonymous_c

STATIC int handle_response_fetch_hsdesc_v3(dir_connection_t *conn, const response_handler_args_t *args); + STATIC int handle_response_fetch_microdesc(dir_connection_t *conn, + const response_handler_args_t *args);

+STATIC int handle_response_fetch_consensus(dir_connection_t *conn, + const response_handler_args_t *args); + #endif /* defined(DIRECTORY_PRIVATE) */

#ifdef TOR_UNIT_TESTS