diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-28 14:46:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-28 14:46:53 -0400 |
| commit | 7286a27cfc74ca81ed71a8579ded95b25564708a (patch) | |
| tree | 11a7f0b008216c05747d30b272cda6c6afa2f2b7 | |
| parent | 6ed57331695bee98f408d99c60684aaadcfe9a43 (diff) | |
| parent | 26c344a563610fcd293cd82bbb0b08dce737e5f3 (diff) | |
| download | tor-7286a27cfc74ca81ed71a8579ded95b25564708a.tar.gz tor-7286a27cfc74ca81ed71a8579ded95b25564708a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
| -rw-r--r-- | changes/bug15850 | 4 | ||||
| -rw-r--r-- | src/or/dirserv.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug15850 b/changes/bug15850 new file mode 100644 index 0000000000..48a7c7bdd7 --- /dev/null +++ b/changes/bug15850 @@ -0,0 +1,4 @@ + o Major bugfix + - Revert commit that made directory authority assign the HSDir flag to + relay without a DirPort which is bad because relay can't handle + BEGIN_DIR cells. Fixes #15850. Bugfix on tor-0.2.6.3-alpha; diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e5a5b54303..a024be8342 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1305,7 +1305,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router, else uptime = real_uptime(router, now); - return (router->wants_to_be_hs_dir && + return (router->wants_to_be_hs_dir && router->dir_port && uptime >= get_options()->MinUptimeHidServDirectoryV2 && router_is_active(router, node, now)); } |