Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

This commit is contained in:
Nick Mathewson 2015-05-13 11:05:05 -04:00
commit 407441c652
6 changed files with 4470 additions and 6870 deletions

4
changes/bug15850 Normal file
View File

@ -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;

3
changes/geoip-april2015 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.

2
changes/geoip6-april2015 Normal file
View File

@ -0,0 +1,2 @@
o Minor features:
- Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1305,7 +1305,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
else else
uptime = real_uptime(router, now); 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 && uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
router_is_active(router, node, now)); router_is_active(router, node, now));
} }