commit 1421f753311e0bf07acfa0a6b2fdf5ec4979412f Merge: 65b012c 2b3518b Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 27 11:03:25 2017 -0500

Merge branch 'maint-0.3.0'

changes/bug20711 | 7 +++++++ src/or/directory.c | 22 ++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-)

diff --cc src/or/directory.c index fae3131,70437fe..e60952f --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -1077,11 -1077,14 +1078,12 @@@ directory_must_use_begindir(const or_op */ static int directory_command_should_use_begindir(const or_options_t *options, - const tor_addr_t *addr, - int or_port, + const tor_addr_t *or_addr, int or_port, + const tor_addr_t *dir_addr, int dir_port, - uint8_t router_purpose, dir_indirection_t indirection, const char **reason) { - (void) router_purpose; - (void) dir_addr; ++ (void)dir_addr; tor_assert(reason); *reason = NULL;

@@@ -1189,7 -1197,9 +1196,10 @@@ directory_initiate_command_rend(const t * send our directory request)? */ const int use_begindir = directory_command_should_use_begindir(options, &or_addr_port->addr, or_addr_port->port, - indirection, &begindir_reason); + &dir_addr_port->addr, dir_addr_port->port, - router_purpose, indirection, ++ indirection, + &begindir_reason); ++ /* Will the connection go via a three-hop Tor circuit? Note that this * is separate from whether it will use_begindir. */ const int anonymized_connection = dirind_is_anon(indirection);