[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

[nickm at torproject.org]

commit d388f9d879ebedf05c7f399f8b8eb3df9c43d3af
Merge: 800797e7f 831d3b794
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 11:01:33 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/bug18329-minimal | 6 ++++++
 src/or/router.c          | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --cc src/or/router.c
index 01316c1bc,90b2431a2..bc7a2fcfc
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2748,6 -2385,16 +2748,15 @@@ router_dump_router_to_string(routerinfo
      smartlist_add_asprintf(chunks, "contact %s\n", ci);
    }
  
+   if (options->BridgeRelay) {
+     const char *bd;
+     if (options->PublishServerDescriptor_ & BRIDGE_DIRINFO)
+       bd = "any";
+     else
+       bd = "none";
+     smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);
+   }
+ 
 -#ifdef CURVE25519_ENABLED
    if (router->onion_curve25519_pkey) {
      char kbuf[128];
      base64_encode(kbuf, sizeof(kbuf),