Merge branch 'maint-0.2.6' into release-0.2.6
This commit is contained in:
commit
1f6b918466
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfixes (sandbox):
|
||||||
|
- Add the "hidserv-stats" filename to our sandbox filter for the
|
||||||
|
HiddenServiceStatistics option to work properly. Fixes bug 17354;
|
||||||
|
bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet.
|
|
@ -0,0 +1,7 @@
|
||||||
|
o Major bugfixes (guard selection):
|
||||||
|
- Actually look at the Guard flag when selecting a new directory
|
||||||
|
guard. When we implemented the directory guard design, we
|
||||||
|
accidentally started treating all relays as if they have the Guard
|
||||||
|
flag during guard selection, leading to weaker anonymity and worse
|
||||||
|
performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
|
||||||
|
by Mohsen Imani.
|
|
@ -0,0 +1,3 @@
|
||||||
|
o Compilation fixes:
|
||||||
|
- Fix a compilation warning with Clang 3.6: Do not check the
|
||||||
|
presence of an address which can never be NULL. Fixes bug 17781.
|
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor features (authorities):
|
||||||
|
- Update the V3 identity key for dannenberg, it was changed on
|
||||||
|
18 November 2015.
|
||||||
|
Closes task #17906. Patch by "teor".
|
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor features:
|
||||||
|
- Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2
|
||||||
|
Country database.
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor features:
|
||||||
|
- Update geoip and geoip6 to the January 5 2016 Maxmind GeoLite2
|
||||||
|
Country database.
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
o Minor features:
|
||||||
|
- Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database.
|
||||||
|
|
13046
src/config/geoip
13046
src/config/geoip
File diff suppressed because it is too large
Load Diff
3780
src/config/geoip6
3780
src/config/geoip6
File diff suppressed because it is too large
Load Diff
|
@ -865,7 +865,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
|
||||||
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
|
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
|
||||||
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
|
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
|
||||||
"dannenberg orport=443 "
|
"dannenberg orport=443 "
|
||||||
"v3ident=585769C78764D58426B8B52B6651A5A71137189A "
|
"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
|
||||||
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
|
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
|
||||||
"urras orport=80 "
|
"urras orport=80 "
|
||||||
"v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
|
"v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
|
||||||
|
|
|
@ -3018,6 +3018,7 @@ sandbox_init_filter(void)
|
||||||
RENAME_SUFFIX2("stats", "exit-stats", ".tmp");
|
RENAME_SUFFIX2("stats", "exit-stats", ".tmp");
|
||||||
RENAME_SUFFIX2("stats", "buffer-stats", ".tmp");
|
RENAME_SUFFIX2("stats", "buffer-stats", ".tmp");
|
||||||
RENAME_SUFFIX2("stats", "conn-stats", ".tmp");
|
RENAME_SUFFIX2("stats", "conn-stats", ".tmp");
|
||||||
|
RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp");
|
||||||
RENAME_SUFFIX("hashed-fingerprint", ".tmp");
|
RENAME_SUFFIX("hashed-fingerprint", ".tmp");
|
||||||
RENAME_SUFFIX("router-stability", ".tmp");
|
RENAME_SUFFIX("router-stability", ".tmp");
|
||||||
|
|
||||||
|
|
|
@ -1501,8 +1501,14 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
|
||||||
if ((type & MICRODESC_DIRINFO) && !is_trusted &&
|
if ((type & MICRODESC_DIRINFO) && !is_trusted &&
|
||||||
!node->rs->version_supports_microdesc_cache)
|
!node->rs->version_supports_microdesc_cache)
|
||||||
continue;
|
continue;
|
||||||
if (for_guard && node->using_as_guard)
|
/* Don't make the same node a guard twice */
|
||||||
continue; /* Don't make the same node a guard twice. */
|
if (for_guard && node->using_as_guard) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
/* Ensure that a directory guard is actually a guard node. */
|
||||||
|
if (for_guard && !node->is_possible_guard) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (try_excluding &&
|
if (try_excluding &&
|
||||||
routerset_contains_routerstatus(options->ExcludeNodes, status,
|
routerset_contains_routerstatus(options->ExcludeNodes, status,
|
||||||
country)) {
|
country)) {
|
||||||
|
|
Loading…
Reference in New Issue