Merge branch 'maint-0.2.5' into maint-0.2.8

diff --cc src/or/router.c
index 01316c1bc216666036231c3aaa574bc035a78cc8,90b2431a222b5096bafed2186784c0706e5c333b..bc7a2fcfc34f1c3481a9fbc882d9c3e3f93e1c8c
--- 1/src/or/router.c
--- 2/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);
    }
  
 -#ifdef CURVE25519_ENABLED
+   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);
+   }
+ 
    if (router->onion_curve25519_pkey) {
      char kbuf[128];
      base64_encode(kbuf, sizeof(kbuf),