January 2018 - tor-commits - lists.torproject.org

[tor/master] Stop logging excessive information about fallback netblocks
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 65520f1bde36286765424cf29f50d67cbc9d8df1 Author: teor <teor2345(a)gmail.com> Date: Fri Jan 5 00:23:52 2018 +1100 Stop logging excessive information about fallback netblocks Implements ticket 24791 --- changes/ticket24791 | 3 +++ scripts/maint/updateFallbackDirs.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket24791 b/changes/ticket24791 new file mode 100644 index 000000000..092ae8511 --- /dev/null +++ b/changes/ticket24791 @@ -0,0 +1,3 @@ + o Code simplification and refactoring (fallbacks): + - Stop logging excessive information about fallback netblocks. + Implements ticket 24791. diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 9f44bc097..dbd15eb51 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1996,7 +1996,7 @@ class CandidateList(dict): # this doesn't actually tell us anything useful #self.describe_fallback_ipv4_netblock_mask(8) self.describe_fallback_ipv4_netblock_mask(16) - self.describe_fallback_ipv4_netblock_mask(24) + #self.describe_fallback_ipv4_netblock_mask(24) # log a message about the proportion of fallbacks in each IPv6 /12 (RIR), # /23 (smaller RIR blocks), /32 (LIR), /48 (Customer), and /64 (Host) @@ -2006,7 +2006,7 @@ class CandidateList(dict): #self.describe_fallback_ipv6_netblock_mask(12) #self.describe_fallback_ipv6_netblock_mask(23) self.describe_fallback_ipv6_netblock_mask(32) - self.describe_fallback_ipv6_netblock_mask(48) + #self.describe_fallback_ipv6_netblock_mask(48) self.describe_fallback_ipv6_netblock_mask(64) # log a message about the proportion of fallbacks in each IPv4 and IPv6

1 0

[tor/master] Merge remote-tracking branch 'teor/fallback-code-2018-01'
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 143da73165d48f21300ee6771b269db98ac76632 Merge: 0b6fe3c12 65520f1bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 5 16:47:28 2018 -0500 Merge remote-tracking branch 'teor/fallback-code-2018-01' changes/bug20942 | 3 + changes/bug24708 | 4 + changes/ticket22321 | 3 + changes/ticket22759 | 5 + changes/ticket24600 | 5 + changes/ticket24679 | 5 + changes/ticket24706 | 6 + changes/ticket24725 | 5 + changes/ticket24726 | 4 + changes/ticket24785 | 6 + changes/ticket24791 | 3 + scripts/maint/fallback.blacklist | 54 +-- scripts/maint/fallback.whitelist | 323 ++++++++++--- scripts/maint/generateFallbackDirLine.py | 38 ++ scripts/maint/lookupFallbackDirContact.py | 28 ++ scripts/maint/updateFallbackDirs.py | 225 ++++++--- src/or/fallback_dirs.inc | 761 ++++++++++++++++++++++++------ 17 files changed, 1146 insertions(+), 332 deletions(-)

1 0

[tor/master] Remove an incorrect C comment in the current fallback list
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 70490df76a65387ea56fa2ed307faf5a4a152914 Author: teor <teor2345(a)gmail.com> Date: Tue Dec 26 18:26:27 2017 +1100 Remove an incorrect C comment in the current fallback list Follow-up to #24725 --- src/or/fallback_dirs.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index dfac15e1e..912a8853c 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -2,7 +2,6 @@ /* version=2.0.0 */ /* ===== */ /* Whitelist & blacklist excluded 1326 of 1513 candidates. */ -/* To comment-out entries in this file, use C comments, and add * to the start of each line. (stem finds fallback entries using " at the start of a line.) */ /* Checked IPv4 DirPorts served a consensus within 15.0s. */ /* Final Count: 151 (Eligible 187, Target 392 (1963 * 0.20), Max 200)

1 0

[tor/master] Make updateFallbackDirs.py search harder for python
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 91a8b37a2ec9dd91ad4b1ce55eb25b1d5de8d4ea Author: teor <teor2345(a)gmail.com> Date: Fri Dec 22 21:42:59 2017 +1100 Make updateFallbackDirs.py search harder for python (Some OSs don't put it in /usr/bin.) Fixes bug 24708; bugfix on 0.2.8.1-alpha. --- changes/bug24708 | 4 ++++ scripts/maint/updateFallbackDirs.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug24708 b/changes/bug24708 new file mode 100644 index 000000000..89eb4f97f --- /dev/null +++ b/changes/bug24708 @@ -0,0 +1,4 @@ + o Minor bugfixes (fallback directory mirrors): + - Make updateFallbackDirs.py search harder for python. + (Some OSs don't put it in /usr/bin.) + Fixes bug 24708; bugfix on 0.2.8.1-alpha. diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 4c0a30a5e..81fb26f88 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Usage: #

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 16fd975a82e502418578c81f04894272c4f11826 Merge: bbc9ff160 c52d4d9e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 5 16:41:34 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket24681 | 6 ++++++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] fix a wide line
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 5 11:28:23 2018 -0500 fix a wide line --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 2a0d091a2..dd0016f7a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -230,8 +230,8 @@ static config_var_t option_vars_[] = { * fallbacks are down. (We rebuild the list when 25% of fallbacks are down). * * We want to reduce load on authorities, but keep these two figures within - * an order of magnitude, so there isn't too much load shifting to authorities - * when fallbacks go down. */ + * an order of magnitude, so there isn't too much load shifting to + * authorities when fallbacks go down. */ V(DirAuthorityFallbackRate, DOUBLE, "0.1"), V(DisableAllSwap, BOOL, "0"), V(DisableDebuggerAttachment, BOOL, "1"),

1 0

[tor/master] fix a wide line
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 94d5523c7f100a2fc94869c55af6ec8e3429df2a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 5 11:28:23 2018 -0500 fix a wide line --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 2a0d091a2..dd0016f7a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -230,8 +230,8 @@ static config_var_t option_vars_[] = { * fallbacks are down. (We rebuild the list when 25% of fallbacks are down). * * We want to reduce load on authorities, but keep these two figures within - * an order of magnitude, so there isn't too much load shifting to authorities - * when fallbacks go down. */ + * an order of magnitude, so there isn't too much load shifting to + * authorities when fallbacks go down. */ V(DirAuthorityFallbackRate, DOUBLE, "0.1"), V(DisableAllSwap, BOOL, "0"), V(DisableDebuggerAttachment, BOOL, "1"),

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 3618bd6166002c7aadbb832d8a3e8bdba193f00c Merge: 9ef97a268 48d94e290 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 5 16:41:34 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket24681 | 6 ++++++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --cc doc/tor.1.txt index fc285ebe1,c4c569836..a319aa938 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -466,11 -450,12 +466,12 @@@ GENERAL OPTION When configured to use both directory authorities and fallback directories, the directory authorities also work as fallbacks. They are chosen with their regular weights, multiplied by this number, which - should be 1.0 or less. (Default: 1.0) + should be 1.0 or less. The default is less than 1, to reduce load on + authorities. (Default: 0.1) -[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + +[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __ipv4address__:__port__ __fingerprint__ + -[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__:: +[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] [**flags**] __ipv4address__:__port__ __ fingerprint__:: These options behave as DirAuthority, but they replace fewer of the default directory authorities. Using AlternateDirAuthority replaces the default Tor directory authorities, but

1 0

[tor/master] Make the default DirAuthorityFallbackRate 0.1
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 30e13716754bc3d991500f5f68eb83a19aea9b11 Author: teor <teor2345(a)gmail.com> Date: Sat Dec 23 00:00:18 2017 +1100 Make the default DirAuthorityFallbackRate 0.1 This makes clients on the public tor network prefer to bootstrap off fallback directory mirrors. This is a follow-up to 24679, which removed weights from the default fallbacks. Implements ticket 24681. --- changes/ticket24681 | 6 ++++++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/ticket24681 b/changes/ticket24681 new file mode 100644 index 000000000..cc0a42b2e --- /dev/null +++ b/changes/ticket24681 @@ -0,0 +1,6 @@ + o Minor features (fallback directory mirrors): + - Make the default DirAuthorityFallbackRate 0.1, so that clients on the + public tor network prefer to bootstrap off fallback directory mirrors. + This is a follow-up to 24679, which removed weights from the default + fallbacks. + Implements ticket 24681. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 74915b711..b286a0656 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -432,7 +432,8 @@ GENERAL OPTIONS When configured to use both directory authorities and fallback directories, the directory authorities also work as fallbacks. They are chosen with their regular weights, multiplied by this number, which - should be 1.0 or less. (Default: 1.0) + should be 1.0 or less. The default is less than 1, to reduce load on + authorities. (Default: 0.1) [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + diff --git a/src/or/config.c b/src/or/config.c index 557790a81..2a0d091a2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -225,7 +225,14 @@ static config_var_t option_vars_[] = { VAR("DirReqStatistics", BOOL, DirReqStatistics_option, "1"), VAR("DirAuthority", LINELIST, DirAuthorities, NULL), V(DirCache, BOOL, "1"), - V(DirAuthorityFallbackRate, DOUBLE, "1.0"), + /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an + * authority when all fallbacks are up, and 2% try an authority when 25% of + * fallbacks are down. (We rebuild the list when 25% of fallbacks are down). + * + * We want to reduce load on authorities, but keep these two figures within + * an order of magnitude, so there isn't too much load shifting to authorities + * when fallbacks go down. */ + V(DirAuthorityFallbackRate, DOUBLE, "0.1"), V(DisableAllSwap, BOOL, "0"), V(DisableDebuggerAttachment, BOOL, "1"), V(DisableIOCP, BOOL, "1"),

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 05 Jan '18

05 Jan '18

commit 0b6fe3c1230a7d135a6a5541b2abb8f6641cc48e Merge: 2d92f4c19 3618bd616 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 5 16:41:35 2018 -0500 Merge branch 'maint-0.3.2' changes/ticket24681 | 6 ++++++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-)

1 0