commit ff905f8e1e3a9df9349a82cfa2724cc50b1523f4 Merge: 337b733cf 41bc1fac8 Author: David Goulet dgoulet@torproject.org Date: Thu Aug 29 08:55:31 2019 -0400

Merge branch 'tor-github/pr/1256' into maint-0.4.1

changes/bug23507 | 5 +++++ changes/bug23818_v3 | 6 ++++++ src/feature/hs/hs_circuit.c | 28 ++++++++++++++++++++++------ src/feature/hs/hs_circuit.h | 3 ++- src/feature/hs/hs_service.c | 30 +++++++++++++++++++++++------- 5 files changed, 58 insertions(+), 14 deletions(-)

diff --cc src/feature/hs/hs_service.c index 8a4f1efb1,b05f20366..283591274 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@@ -2071,7 -2105,9 +2071,8 @@@ build_all_descriptors(time_t now static hs_service_intro_point_t * pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes) { + const or_options_t *options = get_options(); const node_t *node; - extend_info_t *info = NULL; hs_service_intro_point_t *ip = NULL; /* Normal 3-hop introduction point flags. */ router_crn_flags_t flags = CRN_NEED_UPTIME | CRN_NEED_DESC;