From: teor <teor@torproject.org>
Date: Fri, 23 Aug 2019 06:26:32 +0000 (+1000)
Subject: Merge branch 'bug23818_035' into bug23818_master
X-Git-Tag: tor-0.4.2.1-alpha~56^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65935f6da7ac9201c6197f4fc1b57527c8e3457a;p=thirdparty%2Ftor.git

Merge branch 'bug23818_035' into bug23818_master
---

65935f6da7ac9201c6197f4fc1b57527c8e3457a
diff --cc src/feature/hs/hs_service.c
index 8a4f1efb16,b05f20366f..2835912742
--- 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;