[tor-commits] [tor/master] Merge branch 'bug23818_035' into bug23818_master

[dgoulet at torproject.org]

commit 65935f6da7ac9201c6197f4fc1b57527c8e3457a
Merge: d475d7c2f 41bc1fac8
Author: teor <teor at torproject.org>
Date:   Fri Aug 23 16:26:32 2019 +1000

    Merge branch 'bug23818_035' into bug23818_master

 changes/bug23507               |  5 +++++
 changes/bug23818_v2            |  6 ++++++
 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 +++++++++++++++++++++++-------
 src/feature/rend/rendservice.c | 19 +++++++++++++++----
 7 files changed, 79 insertions(+), 18 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;