Merge branch 'maint-0.2.5' into maint-0.2.8

2 files changed, 15 insertions, 0 deletions

diff --git a/changes/bug18329-minimal b/changes/bug18329-minimal
new file mode 100644
index 0000000000..804c4e8dd1
--- /dev/null
+++ b/changes/bug18329-minimal
@@ -0,0 +1,6 @@
+  o Minor features (bridge):
+    - Bridges now include notice in their descriptors that they are bridges,
+      and notice of their distribution status, based on their publication
+      settings.  Implements ticket 18329.  For more fine-grained control of
+      how a bridge is distributed, upgrade to 0.3.2.x or later.
+
diff --git a/src/or/router.c b/src/or/router.c
index 01316c1bc2..bc7a2fcfc3 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2748,6 +2748,15 @@ router_dump_router_to_string(routerinfo_t *router,
     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);
+  }
+
   if (router->onion_curve25519_pkey) {
     char kbuf[128];
     base64_encode(kbuf, sizeof(kbuf),