diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:03:16 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:03:16 -0500 |
commit | 6177674a5b0bba4deea3842195654c59def08f73 (patch) | |
tree | 4d0f125e088e7ae7805384b7708626c4ae786bfb | |
parent | e26f387026134b45ca4f031010abed949c600807 (diff) | |
parent | 831d3b794da65b03be7e4fd107ba209d7211de76 (diff) | |
download | tor-6177674a5b0bba4deea3842195654c59def08f73.tar.gz tor-6177674a5b0bba4deea3842195654c59def08f73.zip |
Merge branch 'maint-0.2.5' into release-0.2.5
-rw-r--r-- | changes/bug18329-minimal | 6 | ||||
-rw-r--r-- | src/or/router.c | 9 |
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 2cdbb0c8bb..90b2431a22 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2385,6 +2385,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); + } + #ifdef CURVE25519_ENABLED if (router->onion_curve25519_pkey) { char kbuf[128]; |