From: David Goulet <dgoulet@torproject.org>
Date: Thu, 29 Aug 2019 12:55:31 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1256' into maint-0.4.1
X-Git-Tag: tor-0.4.1.6~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff905f8e1e3a9df9349a82cfa2724cc50b1523f4;p=thirdparty%2Ftor.git

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

ff905f8e1e3a9df9349a82cfa2724cc50b1523f4
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;