diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:00:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-18 11:00:45 -0500 |
| commit | 831d3b794da65b03be7e4fd107ba209d7211de76 (patch) | |
| tree | 8cfff25841446c5ed6129f1f18e5b14abc1802ed /src | |
| parent | 6f8c32b7deb9f0cec6d1553aba71969c9fb6064f (diff) | |
| parent | 9f2efd02a1281998d11049162c11af6bfc5851c0 (diff) | |
| download | tor-831d3b794da65b03be7e4fd107ba209d7211de76.tar.gz tor-831d3b794da65b03be7e4fd107ba209d7211de76.zip | |
Merge branch 'ticket18329_minimal_025' into maint-0.2.5
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 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]; |