diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:01:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:01:33 -0500 |
| commit | d388f9d879ebedf05c7f399f8b8eb3df9c43d3af (patch) | |
| tree | 8e246f14507317f55e7447dc1d1688d953ab6dc0 /src | |
| parent | 800797e7f3c6cfacbf9655ef7d57ba96028a5c06 (diff) | |
| parent | 831d3b794da65b03be7e4fd107ba209d7211de76 (diff) | |
| download | tor-d388f9d879ebedf05c7f399f8b8eb3df9c43d3af.tar.gz tor-d388f9d879ebedf05c7f399f8b8eb3df9c43d3af.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.8
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/router.c | 9 |
1 files changed, 9 insertions, 0 deletions
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), |