diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:02:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:02:08 -0500 |
| commit | 2d849716df357b570eaf4557638f63a9b2d8a6c1 (patch) | |
| tree | 0eb4e91ab45377d0097efef1097fbc50f272071a | |
| parent | 50fbede4597d143411b3739e88d2c3d8ef457fbd (diff) | |
| parent | 53c3174ee43c3f54f8180be8256180f6f0d24c0d (diff) | |
| download | tor-2d849716df357b570eaf4557638f63a9b2d8a6c1.tar.gz tor-2d849716df357b570eaf4557638f63a9b2d8a6c1.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
| -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 2707e028b8..b870161d32 100644 --- 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), |