tor

commit 2d849716df357b570eaf4557638f63a9b2d8a6c1
parent 50fbede4597d143411b3739e88d2c3d8ef457fbd
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sat, 18 Nov 2017 11:02:08 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

Diffstat:
A
changes/bug18329-minimal
 | 
6
++++++
M
src/or/router.c
 | 
9
+++++++++

2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/changes/bug18329-minimal 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
@@ -2881,6 +2881,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),