Merge branch 'bug23818_035' into bug23818_master

diff --cc src/feature/hs/hs_circuit.c
Simple merge

diff --cc src/feature/hs/hs_service.c
index 8a4f1efb16141d3130ea021b3219578711222ebb,b05f20366f608ff03882a9a94686b1b96417a2cb..28359127423493d6ce37136abe230db451312b7c
--- 1/src/feature/hs/hs_service.c
--- 2/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;

diff --cc src/feature/rend/rendservice.c
Simple merge