tor-commits April 2016

tor-commits@lists.torproject.org

20 participants
1645 discussions

[user-manual/master] Add note about removing Tor Browser on Linux
by colin＠torproject.org 28 Apr '16

28 Apr '16

commit bcb75e8bfad2d9c64655a6064ca5c5e15d03a3d7 Author: Colin Childs <colin(a)torproject.org> Date: Thu Apr 28 00:42:08 2016 -0500 Add note about removing Tor Browser on Linux --- C/uninstalling.page | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/C/uninstalling.page b/C/uninstalling.page index eab010e..fbb8fa7 100644 --- a/C/uninstalling.page +++ b/C/uninstalling.page @@ -23,7 +23,9 @@ Removing Tor Browser from your system is simple: <item> &… [View More]

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit 9d0db6e56f7b1620bdca1913edc84870b51a7b31 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 00:45:07 2016 +0000 Update translations for bridgedb_completed --- id/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index b98eeaf..5a96fc3 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -13,14 +13,15 @@ # L1Nus <… [View More]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit d533d6874e63b808e31c9168cb12239cb239ba94 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 00:45:03 2016 +0000 Update translations for bridgedb --- id/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index b98eeaf..5a96fc3 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -13,14 +13,15 @@ # L1Nus <multazam_ali(a)… [View More]

1 0

[webwml/master] remove distracting lines about obsolete packages
by arma＠torproject.org 27 Apr '16

27 Apr '16

commit 4d64c10b63d403223e08fffcc3bdbcc299802f3d Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 17:42:16 2016 -0400 remove distracting lines about obsolete packages also find the new tails key and put it back on the page --- docs/en/signing-keys.wml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index a1ab724..f169d36 100644 --- a/docs/en/signing-keys.wml +++ b/… [View More]

1 0

[webwml/master] update keys for active signers
by arma＠torproject.org 27 Apr '16

27 Apr '16

commit 9cfda38b58a8c4d4f983ac221990057dd21f67f6 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 17:17:24 2016 -0400 update keys for active signers --- docs/en/signing-keys.wml | 119 ++++++++++------------------------------------- 1 file changed, 25 insertions(+), 94 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index 91b3448..a1ab724 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -45,25 +45,20 @@ … [View More]pub 4096R/19F78451 2010-05-07 Key fingerprint = F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451 - uid Roger Dingledine <arma(a)mit.edu> - uid Roger Dingledine <arma(a)freehaven.net> uid Roger Dingledine <arma(a)torproject.org> - sub 4096R/0DCC0FE1 2013-05-09 [expires: 2014-05-09] + sub 4096R/B0E5067D 2015-06-10 [expires: 2016-06-09] pub 3072R/165733EA 2004-07-03 Key fingerprint = B35B F85B F194 89D0 4E28 C33C 2119 4EBB 1657 33EA uid Nick Mathewson <nickm(a)alum.mit.edu> uid Nick Mathewson <nickm(a)wangafu.net> uid Nick Mathewson <nickm(a)freehaven.net> - uid [jpeg image of size 3369] sub 3072R/8D29319A 2004-07-03 sub 3072R/F25B8E5E 2004-07-03 pub 2048R/63FEE659 2003-10-16 Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 uid Erinn Clark <erinn(a)torproject.org> - uid Erinn Clark <erinn(a)debian.org> - uid Erinn Clark <erinn(a)double-helix.org> sub 2048R/EB399FD7 2003-10-16 pub 1024D/F1F5C9B5 2010-02-03 @@ -71,38 +66,13 @@ uid Erinn Clark <erinn(a)torproject.org> sub 1024g/7828F26A 2010-02-03 - pub 1024D/31B0974B 2003-07-17 - Key fingerprint = 0295 9AA7 190A B9E9 027E 0736 3B9D 093F 31B0 974B - uid Andrew Lewman <andrew(a)lewman.com> - uid Andrew Lewman <andrew(a)torproject.org> - sub 4096g/B77F95F7 2003-07-17 - - pub 4096R/6B4D6475 2012-02-29 - Key fingerprint = 0291 ECCB E42B 2206 8E68 5545 627D EE28 6B4D 6475 - uid Andrew Lewman <andrew(a)torproject.org> - uid Andrew Lewman <andrew(a)torproject.is> - sub 4096R/BE713AC6 2012-02-29 - - pub 2048R/886DDD89 2009-09-04 [expires: 2014-09-03] + pub 2048R/886DDD89 2009-09-04 [expires: 2020-08-29] Key fingerprint = A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89 uid deb.torproject.org archive signing key - sub 2048R/219EC810 2009-09-04 [expires: 2014-08-29] - - pub 1024D/9A753A6B 2009-09-11 - Key fingerprint = 553D 7C2C 626E F16F 27F3 30BC 95E3 881D 9A75 3A6B - uid Tomás Touceda <chiiph(a)gmail.com> - sub 1024g/33BE0E5B 2009-09-11 - - pub 1024D/5FA14861 2005-08-17 - Key fingerprint = 9467 294A 9985 3C9C 65CB 141D AF7E 0E43 5FA1 4861 - uid Matt Edman <edmanm(a)rpi.edu> - uid Matt Edman <Matt_Edman(a)baylor.edu> - uid Matt Edman <edmanm2(a)cs.rpi.edu> - sub 4096g/EA654E59 2005-08-17 + sub 2048R/219EC810 2009-09-04 [expires: 2018-08-30] pub 1024D/9ABBEEC6 2009-06-17 Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4 5AD9 0445 B7AB 9ABB EEC6 - uid Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> uid Damian Johnson <atagar(a)torproject.org> sub 2048g/146276B2 2009-06-17 sub 2048R/87F30690 2010-08-07 @@ -110,18 +80,8 @@ pub 8192R/683686CC 2013-09-11 Key fingerprint = C963 C21D 6356 4E2B 10BB 335B 2984 6B3C 6836 86CC uid Mike Perry (Regular use key) <mikeperry(a)torproject.org> - sub 4096R/0E3A92E4 2013-09-11 [expires: 2014-09-11] - sub 4096R/BC40FFA0 2013-09-11 [expires: 2014-09-11] - - pub 1024D/22F6856F 2006-08-19 - Key fingerprint = DDB4 6B5B 7950 CD47 E59B 5189 4C09 25CF 22F6 856F - uid Robert Hogan <robert(a)roberthogan.net> - sub 1024g/FC4A9460 2006-08-19 - - pub 2048R/4279F297 2013-01-02 - Key fingerprint = 97BB 9413 1873 FFD3 1331 64CC 7EB4 5C0A 4279 F297 - uid Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> - sub 2048R/76D943F1 2013-01-02 + sub 4096R/0F129402 2015-09-07 [expires: 2016-09-11] + sub 4096R/ACC0A961 2015-09-07 [expires: 2016-09-11] pub 4096R/C5AA446D 2010-07-14 Key fingerprint = 261C 5FBE 7728 5F88 FB0C 3432 66C8 C2D7 C5AA 446D @@ -131,15 +91,9 @@ pub 4096R/C82E0039 2003-03-24 Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039 - uid Peter Palfrader uid Peter Palfrader <peter(a)palfrader.org> uid Peter Palfrader <weasel(a)debian.org> - pub 4096R/BE2CD9C1 2010-10-07 [expires: 2015-02-05] - Key fingerprint = 0D24 B36A A9A2 A651 7878 7645 1202 821C BE2C D9C1 - uid Tails developers (signing key) <tails(a)boum.org> - uid T(A)ILS developers (signing key) <amnesia(a)boum.org> - pub 8192R/C11F6276 2012-07-21 Key fingerprint = AD1A B35C 674D F572 FBCE 8B0A 6BC7 58CB C11F 6276 uid David Fifield <david(a)bamsoftware.com> @@ -148,59 +102,36 @@ pub 4096R/23291265 2010-05-07 Key fingerprint = 8C4C D511 095E 982E B0EF BFA2 1E8B F349 2329 1265 - uid Linus Nordberg <linus(a)nordberg.se> - uid Linus Nordberg <linus(a)nordu.net> uid Linus Nordberg <linus(a)torproject.org> - uid [jpeg image of size 2906] - sub 4096R/153E576C 2013-04-23 [expires: 2014-04-23] + sub 4096R/B5F7D1B1 2016-04-14 [expires: 2017-04-14] pub 4096R/4B7C3223 2013-07-30 Key fingerprint = 35CD 74C2 4A9B 15A1 9E1A 81A1 9437 3AA9 4B7C 3223 uid Georg Koppen <gk(a)torproject.org> - uid Georg Koppen <groeg(a)vfemail.net> - uid Georg Koppen <georg(a)getfoxyproxy.org> - sub 4096R/97955E07 2013-07-30 [expires: 2014-07-30] - sub 4096R/AC3A821D 2013-07-30 [expires: 2014-07-30] - sub 4096R/A97A53DC 2014-07-08 [expires: 2015-07-08] - sub 4096R/E5AE3C98 2014-07-08 [expires: 2015-07-08] sub 4096R/24690903 2015-07-20 [expires: 2016-07-19] sub 4096R/631602F4 2015-07-20 [expires: 2016-07-19] pub 4096R/D0220E4B 2014-03-19 Key fingerprint = 4A90 646C 0BAE D9D4 56AB 3111 E5B8 1856 D022 0E4B -uid Nicolas Vigier (TBB Builds Signing Key) <boklm(a)torproject.org> - - pub 4096R/D255D3F5C868227F 2014-06-27 [expires: 2024-06-24] - Key fingerprint = D2C6 7D20 E9C3 6C2A C5FE 74A2 D255 D3F5 C868 227F - uid Jacob Appelbaum <jacob(a)appelbaum.net> - sub 3072R/02636620744301A2 2014-06-27 [expires: 2015-06-27] - sub 3072R/1A055A481801A819 2014-06-27 [expires: 2015-06-27] - - pub 4096R/90BC9192B06291B2 2014-06-27 [expires: 2024-06-24] - Key fingerprint = 043E 0E69 DD56 BA59 5905 8756 90BC 9192 B062 91B2 - uid Jacob Appelbaum <error(a)debian.org> - sub 3072R/F78ED60FFE4F141F 2014-06-27 [expires: 2015-06-27] - sub 3072R/986D6BCEF02A9C9C 2014-06-27 [expires: 2015-06-27] - sub 2048R/89AA6E5D2C6A7F40 2014-10-22 [expires: 2016-10-21] - - pub 4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24] - Key fingerprint = D6A9 48CF 297F 7539 30B4 756A FA7F 0E44 D487 F03F - uid Jacob Appelbaum <jacob(a)torproject.org> - sub 3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27] - sub 3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27] - - pub 4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24] - Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 - uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> - sub 4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25] - sub 4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25] - - pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2016-05-09] - uid David Goulet <dgoulet(a)ev0ke.net> - uid David Goulet <dgoulet(a)riseup.net> - uid David Goulet <dgoulet(a)torproject.org> - sub 4096g/0xCD885877FE9D6620 2011-05-11 [expires: 2016-05-09] - sub 4096R/0x2AC6036C93CC198D 2013-09-10 [expires: 2015-09-10] + uid Nicolas Vigier (TBB Builds Signing Key) <boklm(a)torproject.org> + + pub 4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24] + Key fingerprint = D6A9 48CF 297F 7539 30B4 756A FA7F 0E44 D487 F03F + uid Jacob Appelbaum <jacob(a)torproject.org> + sub 3072R/36A3F38A 2015-07-01 [expires: 2016-06-30] + sub 3072R/45EDE84B 2015-07-01 [expires: 2016-06-30] + + pub 4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24] + Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 + uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> + sub 4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25] + sub 4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25] + + pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2016-05-09] + Key fingerprint = B744 17ED DF22 AC9F 9E90 F491 42E8 6A2A 11F4 8D36 + uid David Goulet <dgoulet(a)torproject.org> + sub 4096g/FE9D6620 2011-05-11 [expires: 2016-05-09] + sub 4096R/93CC198D 2013-09-10 [expires: 2016-09-10] </pre> </div> [View Less]

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 27 Apr '16

27 Apr '16

commit c93bfa0a9b2cb65b791485f8494ee1d03b375f83 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 27 14:15:47 2016 +0000 Update translations for tails-misc_completed --- nb.po | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nb.po b/nb.po index 28a8300..133851e 100644 --- a/nb.po +++ b/nb.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date:… [View More] 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-04-02 13:50+0000\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-04-27 13:48+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -68,13 +68,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Vil du starte Electrum uansett?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Start" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Avslutt" @@ -236,17 +236,24 @@ msgstr "Ytelse av GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Andre meldinger gitt av GnuPG:" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "Vedvarende Claws e-post har blitt påskrudd." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Hvis du har e-poster lagret i Claws e-post, burde du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>flytte over dataen din</a> før du starter Icedove." +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Hvis du allerede har flyttet dine e-poster til Icedove, burde du først <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>slette all din e-post Claws Mail-data</a> for å fjerne denne advarselen." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Start på nytt" [View Less]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Apr '16

27 Apr '16

commit 66056a99726bba923e55801a0e087fc94abd5df9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 27 14:15:43 2016 +0000 Update translations for tails-misc --- nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb.po b/nb.po index 8ce2caa..133851e 100644 --- a/nb.po +++ b/nb.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-… [View More]

1 0

[tor/maint-0.2.8] Changes for #17158, #17905, #18689, #18749 & April 2016 fallbacks
by nickm＠torproject.org 26 Apr '16

26 Apr '16

commit de5def32a1dbe35d773219a11bfcf9dac3fe96f2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Mar 30 12:45:22 2016 +1100 Changes for #17158, #17905, #18689, #18749 & April 2016 fallbacks --- changes/fallbacks-201604 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changes/fallbacks-201604 b/changes/fallbacks-201604 new file mode 100644 index 0000000..f88d5c6 --- /dev/null +++ b/changes/fallbacks-201604 @@ -0,0 +1,8 @@ + o Minor enhancements (… [View More]

1 0

[tor/master] Remove fallback directory weights
by nickm＠torproject.org 26 Apr '16

26 Apr '16

commit 205a641e1dad6db967825dcad01bc59c6909b395 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Mar 31 12:47:42 2016 +1100 Remove fallback directory weights Give each fallback a set weight of 10.0 for client selection. Fallbacks must have at least 3000 consensus weight. This is (nominally) 100 times the expected extra load of 20 kilobytes per second (50 GB per month). Fixes issue #17905. --- scripts/maint/updateFallbackDirs.py | … [View More]221 +++++++----------------------------- 1 file changed, 40 insertions(+), 181 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 4860700..124f85f 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -120,39 +120,31 @@ CONSENSUS_DOWNLOAD_RETRY = True # The target for these parameters is 20% of the guards in the network # This is around 200 as of October 2015 -FALLBACK_PROPORTION_OF_GUARDS = None if OUTPUT_CANDIDATES else 0.2 +_FB_POG = 0.2 +FALLBACK_PROPORTION_OF_GUARDS = None if OUTPUT_CANDIDATES else _FB_POG # Limit the number of fallbacks (eliminating lowest by weight) MAX_FALLBACK_COUNT = None if OUTPUT_CANDIDATES else 500 # Emit a C #error if the number of fallbacks is below -MIN_FALLBACK_COUNT = 50 +MIN_FALLBACK_COUNT = 100 ## Fallback Weight Settings -# Any fallback with the Exit flag has its weight multipled by this fraction +# Any fallback with the Exit flag has its consensus weight multipled by this EXIT_WEIGHT_FRACTION = 1.0 -# If True, emit a C #error if we can't satisfy various constraints -# If False, emit a C comment instead -STRICT_FALLBACK_WEIGHTS = False - -# Limit the proportional weight -# If a single fallback's weight is too high, it will see too many clients -# We reweight using a lower threshold to provide some leeway for: -# * elimination of low weight relays -# * consensus weight changes -# * fallback directory losses over time -# A relay weighted at 1 in 10 fallbacks will see about 10% of clients that -# use the fallback directories. (The 9 directory authorities see a similar -# proportion of clients.) -TARGET_MAX_WEIGHT_FRACTION = 1/10.0 -REWEIGHTING_FUDGE_FACTOR = 0.8 -MAX_WEIGHT_FRACTION = TARGET_MAX_WEIGHT_FRACTION * REWEIGHTING_FUDGE_FACTOR -# If a single fallback's weight is too low, it's pointless adding it. -# (Final weights may be slightly higher than this, due to low weight relays -# being excluded.) -# A relay weighted at 1 in 1000 fallbacks will see about 0.1% of clients. -MIN_WEIGHT_FRACTION = 0.0 if OUTPUT_CANDIDATES else 1/1000.0 +# If a single fallback's consensus weight is too low, it's pointless adding it +# We expect fallbacks to handle an extra 30 kilobytes per second of traffic +# Make sure they support a hundred times that +MIN_CONSENSUS_WEIGHT = 30.0 * 100.0 + +# All fallback weights are equal, and set to the value below +# Authorities are weighted 1.0 by default +# Clients use these weights to select fallbacks and authorities at random +# If there are 100 fallbacks and 9 authorities: +# - each fallback is chosen with probability 10/(1000 + 9) ~= 0.99% +# - each authority is chosen with probability 1/(1000 + 9) ~= 0.09% +FALLBACK_OUTPUT_WEIGHT = 10.0 ## Other Configuration Parameters @@ -465,9 +457,7 @@ class Candidate(object): logging.debug("Failed to get an ipv6 address for %s."%(self._fpr,)) # Reduce the weight of exits to EXIT_WEIGHT_FRACTION * consensus_weight if self.is_exit(): - current_weight = self._data['consensus_weight'] - exit_weight = current_weight * EXIT_WEIGHT_FRACTION - self._data['original_consensus_weight'] = current_weight + exit_weight = self._data['consensus_weight'] * EXIT_WEIGHT_FRACTION self._data['consensus_weight'] = exit_weight def _stable_sort_or_addresses(self): @@ -757,6 +747,12 @@ class Candidate(object): logging.info('%s not a candidate: guard avg too low (%lf)', self._fpr, self._guard) return False + if (MIN_CONSENSUS_WEIGHT is not None + and self._data['consensus_weight'] < MIN_CONSENSUS_WEIGHT): + logging.info('%s not a candidate: consensus weight %.0f too low, must ' + + 'be at least %.0f', self._fpr, + self._data['consensus_weight'], MIN_CONSENSUS_WEIGHT) + return False return True def is_in_whitelist(self, relaylist): @@ -895,20 +891,6 @@ class Candidate(object): def is_running(self): return 'Running' in self._data['flags'] - def fallback_weight_fraction(self, total_weight): - return float(self._data['consensus_weight']) / total_weight - - # return the original consensus weight, if it exists, - # or, if not, return the consensus weight - def original_consensus_weight(self): - if self._data.has_key('original_consensus_weight'): - return self._data['original_consensus_weight'] - else: - return self._data['consensus_weight'] - - def original_fallback_weight_fraction(self, total_weight): - return float(self.original_consensus_weight()) / total_weight - @staticmethod def fallback_consensus_dl_speed(dirip, dirport, nickname, max_time): download_failed = False @@ -976,17 +958,15 @@ class Candidate(object): CONSENSUS_DOWNLOAD_SPEED_MAX) return ((not ipv4_failed) and (not ipv6_failed)) - def fallbackdir_line(self, total_weight, original_total_weight, dl_speed_ok): + def fallbackdir_line(self, dl_speed_ok): # /* # nickname # flags - # weight / total (percentage) - # [original weight / original total (original percentage)] # [contact] # */ # "address:dirport orport=port id=fingerprint" # "[ipv6=addr:orport]" - # "weight=num", + # "weight=FALLBACK_OUTPUT_WEIGHT", # # Multiline C comment s = '/*' @@ -996,19 +976,6 @@ class Candidate(object): s += 'Flags: ' s += cleanse_c_multiline_comment(' '.join(sorted(self._data['flags']))) s += '\n' - weight = self._data['consensus_weight'] - percent_weight = self.fallback_weight_fraction(total_weight)*100 - s += 'Fallback Weight: %d / %d (%.3f%%)'%(weight, total_weight, - percent_weight) - s += '\n' - o_weight = self.original_consensus_weight() - if o_weight != weight: - o_percent_weight = self.original_fallback_weight_fraction( - original_total_weight)*100 - s += 'Consensus Weight: %d / %d (%.3f%%)'%(o_weight, - original_total_weight, - o_percent_weight) - s += '\n' if self._data['contact'] is not None: s += cleanse_c_multiline_comment(self._data['contact']) s += '\n' @@ -1030,7 +997,7 @@ class Candidate(object): s += '" ipv6=%s:%s"'%( cleanse_c_string(self.ipv6addr), cleanse_c_string(self.ipv6orport)) s += '\n' - s += '" weight=%d",'%(weight) + s += '" weight=%d",'%(FALLBACK_OUTPUT_WEIGHT) if not dl_speed_ok: s += '\n' s += '*/' @@ -1205,48 +1172,11 @@ class CandidateList(dict): # Remove any fallbacks in excess of MAX_FALLBACK_COUNT, # starting with the lowest-weighted fallbacks - # total_weight should be recalculated after calling this + # this changes total weight def exclude_excess_fallbacks(self): if MAX_FALLBACK_COUNT is not None: self.fallbacks = self.fallbacks[:MAX_FALLBACK_COUNT] - # Clamp the weight of all fallbacks to MAX_WEIGHT_FRACTION * total_weight - # fallbacks are kept sorted, but since excessive weights are reduced to - # the maximum acceptable weight, these relays end up with equal weights - def clamp_high_weight_fallbacks(self, total_weight): - if MAX_WEIGHT_FRACTION * len(self.fallbacks) < 1.0: - error_str = 'Max Fallback Weight %.3f%% is unachievable'%( - MAX_WEIGHT_FRACTION) - error_str += ' with Current Fallback Count %d.'%(len(self.fallbacks)) - if STRICT_FALLBACK_WEIGHTS: - print '#error ' + error_str - else: - print '/* ' + error_str + ' */' - relays_clamped = 0 - max_acceptable_weight = total_weight * MAX_WEIGHT_FRACTION - for f in self.fallbacks: - frac_weight = f.fallback_weight_fraction(total_weight) - if frac_weight > MAX_WEIGHT_FRACTION: - relays_clamped += 1 - current_weight = f._data['consensus_weight'] - # if we already have an original weight, keep it - if (not f._data.has_key('original_consensus_weight') - or f._data['original_consensus_weight'] == current_weight): - f._data['original_consensus_weight'] = current_weight - f._data['consensus_weight'] = max_acceptable_weight - return relays_clamped - - # Remove any fallbacks with weights lower than MIN_WEIGHT_FRACTION - # total_weight should be recalculated after calling this - def exclude_low_weight_fallbacks(self, total_weight): - self.fallbacks = filter( - lambda x: - x.fallback_weight_fraction(total_weight) >= MIN_WEIGHT_FRACTION, - self.fallbacks) - - def fallback_weight_total(self): - return sum(f._data['consensus_weight'] for f in self.fallbacks) - def fallback_min_weight(self): if len(self.fallbacks) > 0: return self.fallbacks[-1] @@ -1259,14 +1189,12 @@ class CandidateList(dict): else: return None - def summarise_fallbacks(self, eligible_count, eligible_weight, - relays_clamped, clamped_weight, - guard_count, target_count, max_count): + def summarise_fallbacks(self, eligible_count, guard_count, target_count, + max_count): # Report: # the number of fallback directories (with min & max limits); # #error if below minimum count - # the total weight, min & max fallback proportions - # #error if outside max weight proportion + # min & max fallback weights # Multiline C comment with #error if things go bad s = '/*' s += '\n' @@ -1279,7 +1207,7 @@ class CandidateList(dict): else: fallback_proportion = '%d (%d * %f)'%(target_count, guard_count, FALLBACK_PROPORTION_OF_GUARDS) - s += 'Final Count: %d (Eligible %d, Usable %d, Target %d%s'%( + s += 'Final Count: %d (Eligible %d, Target %d%s'%( min(max_count, fallback_count), eligible_count, fallback_count, @@ -1299,51 +1227,19 @@ class CandidateList(dict): s += '\n' s += '/*' s += '\n' - total_weight = self.fallback_weight_total() min_fb = self.fallback_min_weight() min_weight = min_fb._data['consensus_weight'] - min_percent = min_fb.fallback_weight_fraction(total_weight)*100.0 max_fb = self.fallback_max_weight() max_weight = max_fb._data['consensus_weight'] - max_frac = max_fb.fallback_weight_fraction(total_weight) - max_percent = max_frac*100.0 - s += 'Final Weight: %d (Eligible %d)'%(total_weight, eligible_weight) - s += '\n' - s += 'Max Weight: %d (%.3f%%) (Clamped to %.3f%%)'%( - max_weight, - max_percent, - TARGET_MAX_WEIGHT_FRACTION*100) + s += 'Max Weight: %d'%(max_weight) s += '\n' - s += 'Min Weight: %d (%.3f%%) (Clamped to %.3f%%)'%( - min_weight, - min_percent, - MIN_WEIGHT_FRACTION*100) + s += 'Min Weight: %d'%(min_weight) s += '\n' if eligible_count != fallback_count: - s += 'Excluded: %d (Clamped, Below Target, or Low Weight)'%( + s += 'Excluded: %d (Eligible Count Exceeded Target Count)'%( eligible_count - fallback_count) s += '\n' - if relays_clamped > 0: - s += 'Clamped: %d (%.3f%%) Excess Weight, '%( - clamped_weight, - (100.0 * clamped_weight) / total_weight) - s += '%d High Weight Fallbacks (%.1f%%)'%( - relays_clamped, - (100.0 * relays_clamped) / fallback_count) - s += '\n' s += '*/' - if max_frac > TARGET_MAX_WEIGHT_FRACTION: - s += '\n' - # We must restrict the maximum fallback weight, so an adversary - # at or near the fallback doesn't see too many clients - error_str = 'Max Fallback Weight %.3f%% is too high. '%(max_frac*100) - error_str += 'Must be at most %.3f%% for client anonymity.'%( - TARGET_MAX_WEIGHT_FRACTION*100) - if STRICT_FALLBACK_WEIGHTS: - s += '#error ' + error_str - else: - s += '/* ' + error_str + ' */' - s += '\n' if PERFORM_IPV4_DIRPORT_CHECKS or PERFORM_IPV6_DIRPORT_CHECKS: s += '/* Checked %s%s%s DirPorts served a consensus within %.1fs. */'%( 'IPv4' if PERFORM_IPV4_DIRPORT_CHECKS else '', @@ -1386,54 +1282,17 @@ def list_fallbacks(): excluded_count = candidates.apply_filter_lists() print candidates.summarise_filters(initial_count, excluded_count) eligible_count = len(candidates.fallbacks) - eligible_weight = candidates.fallback_weight_total() # print the raw fallback list - #total_weight = candidates.fallback_weight_total() #for x in candidates.fallbacks: - # print x.fallbackdir_line(total_weight, total_weight) + # print x.fallbackdir_line(True) - # When candidates are excluded, total_weight decreases, and - # the proportional weight of other candidates increases. + # exclude low-weight fallbacks if we have more than we want candidates.exclude_excess_fallbacks() - total_weight = candidates.fallback_weight_total() - - # When candidates are reweighted, total_weight decreases, and - # the proportional weight of other candidates increases. - # Previously low-weight candidates might obtain sufficient proportional - # weights to be included. - # Save the weight at which we reweighted fallbacks for the summary. - pre_clamp_total_weight = total_weight - relays_clamped = candidates.clamp_high_weight_fallbacks(total_weight) - - # When candidates are excluded, total_weight decreases, and - # the proportional weight of other candidates increases. - # No new low weight candidates will be created during exclusions. - # However, high weight candidates may increase over the maximum proportion. - # This should not be an issue, except in pathological cases. - candidates.exclude_low_weight_fallbacks(total_weight) - total_weight = candidates.fallback_weight_total() - - # check we haven't exceeded TARGET_MAX_WEIGHT_FRACTION - # since reweighting preserves the orginal sort order, - # the maximum weights will be at the head of the list - if len(candidates.fallbacks) > 0: - max_weight_fb = candidates.fallback_max_weight() - max_weight = max_weight_fb.fallback_weight_fraction(total_weight) - if max_weight > TARGET_MAX_WEIGHT_FRACTION: - error_str = 'Maximum fallback weight: %.3f%% exceeds target %.3f%%. '%( - max_weight*100.0, - TARGET_MAX_WEIGHT_FRACTION*100.0) - error_str += 'Try decreasing REWEIGHTING_FUDGE_FACTOR.' - if STRICT_FALLBACK_WEIGHTS: - print '#error ' + error_str - else: - print '/* ' + error_str + ' */' - print candidates.summarise_fallbacks(eligible_count, eligible_weight, - relays_clamped, - pre_clamp_total_weight - total_weight, - guard_count, target_count, max_count) + if len(candidates.fallbacks) > 0: + print candidates.summarise_fallbacks(eligible_count, guard_count, + target_count, max_count) else: print '/* No Fallbacks met criteria */' @@ -1442,7 +1301,7 @@ def list_fallbacks(): for x in candidates.fallbacks[:max_count]: dl_speed_ok = x.fallback_consensus_dl_check() - print x.fallbackdir_line(total_weight, pre_clamp_total_weight, dl_speed_ok) + print x.fallbackdir_line(dl_speed_ok) #print json.dumps(candidates[x]._data, sort_keys=True, indent=4, # separators=(',', ': '), default=json_util.default) [View Less]

1 0

[tor/maint-0.2.8] Report fallback directory detail changes when rebuilding list
by nickm＠torproject.org 26 Apr '16

26 Apr '16

commit ba7691071e284623cc0c6e3e8ca8ff94d4be7ded Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sat Apr 16 01:43:11 2016 +1000 Report fallback directory detail changes when rebuilding list As well as the existing reports of IPv6 address additions or removals, the script now warns when keys change but IPv4:ORPort or IPv6:IPv6ORPort remain the same. Existing checks for other whitelist detail changes have also been re-worded and upgraded to … [View More]warnings. This makes it easier for changes to be identified so operators can be contacted to confirm whether the change is stable. --- changes/fallbacks-201604 | 5 ++-- scripts/maint/updateFallbackDirs.py | 46 ++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/changes/fallbacks-201604 b/changes/fallbacks-201604 index f88d5c6..d61615a 100644 --- a/changes/fallbacks-201604 +++ b/changes/fallbacks-201604 @@ -1,8 +1,9 @@ o Minor enhancements (fallback directory mirrors): - Give each fallback the same weight for client selection. Restrict fallbacks to one per operator. + Report fallback directory detail changes when rebuilding list. Add new fallback directory mirrors to the whitelist. Update fallback directories based on the latest OnionOO data. Many other minor simplifications and fixes. - Closes tasks 17158, 17905, 18749, and bug 18689 on - tor 0.2.8.1-alpha; patch by "teor". + Closes tasks 17158, 17905, 18749, bug 18689, and fixes part of + bug 18812 on tor 0.2.8.1-alpha; patch by "teor". diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 4cfee5d..d27c144 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -806,48 +806,48 @@ class Candidate(object): ipv6 address and port (if present) If the fallback has an ipv6 key, the whitelist line must also have it, and vice versa, otherwise they don't match. """ + ipv6 = None + if self.has_ipv6(): + ipv6 = '%s:%d'%(self.ipv6addr, self.ipv6orport) for entry in relaylist: - if entry['id'] != self._fpr: - # can't log here, every relay's fingerprint is compared to the entry + if entry['id'] != self._fpr: + # can't log here unless we match an IP and port, because every relay's + # fingerprint is compared to every entry's fingerprint + if entry['ipv4'] == self.dirip and int(entry['orport']) == self.orport: + logging.warning('%s excluded: has OR %s:%d changed fingerprint to ' + + '%s?', entry['id'], self.dirip, self.orport, + self._fpr) + if self.has_ipv6() and entry.has_key('ipv6') and entry['ipv6'] == ipv6: + logging.warning('%s excluded: has OR %s changed fingerprint to ' + + '%s?', entry['id'], ipv6, self._fpr) continue if entry['ipv4'] != self.dirip: - logging.info('%s is not in the whitelist: fingerprint matches, but ' + - 'IPv4 (%s) does not match entry IPv4 (%s)', - self._fpr, self.dirip, entry['ipv4']) + logging.warning('%s excluded: has it changed IPv4 from %s to %s?', + self._fpr, entry['ipv4'], self.dirip) continue if int(entry['dirport']) != self.dirport: - logging.info('%s is not in the whitelist: fingerprint matches, but ' + - 'DirPort (%d) does not match entry DirPort (%d)', - self._fpr, self.dirport, int(entry['dirport'])) + logging.warning('%s excluded: has it changed DirPort from %s:%d to ' + + '%s:%d?', self._fpr, self.dirip, int(entry['dirport']), + self.dirip, self.dirport) continue if int(entry['orport']) != self.orport: - logging.info('%s is not in the whitelist: fingerprint matches, but ' + - 'ORPort (%d) does not match entry ORPort (%d)', - self._fpr, self.orport, int(entry['orport'])) + logging.warning('%s excluded: has it changed ORPort from %s:%d to ' + + '%s:%d?', self._fpr, self.dirip, int(entry['orport']), + self.dirip, self.orport) continue - ipv6 = None - if self.has_ipv6(): - ipv6 = '%s:%d'%(self.ipv6addr, self.ipv6orport) if entry.has_key('ipv6') and self.has_ipv6(): # if both entry and fallback have an ipv6 address, compare them if entry['ipv6'] != ipv6: - logging.info('%s is not in the whitelist: fingerprint matches, ' + - 'but IPv6 (%s) does not match entry IPv6 (%s)', - self._fpr, ipv6, entry['ipv6']) + logging.warning('%s excluded: has it changed IPv6 ORPort from %s ' + + 'to %s?', self._fpr, entry['ipv6'], ipv6) continue # if the fallback has an IPv6 address but the whitelist entry # doesn't, or vice versa, the whitelist entry doesn't match elif entry.has_key('ipv6') and not self.has_ipv6(): - logging.info('%s is not in the whitelist: fingerprint matches, but ' + - 'it has no IPv6, and entry has IPv6 (%s)', self._fpr, - entry['ipv6']) logging.warning('%s excluded: has it lost its former IPv6 address %s?', self._fpr, entry['ipv6']) continue elif not entry.has_key('ipv6') and self.has_ipv6(): - logging.info('%s is not in the whitelist: fingerprint matches, but ' + - 'it has IPv6 (%s), and entry has no IPv6', self._fpr, - ipv6) logging.warning('%s excluded: has it gained an IPv6 address %s?', self._fpr, ipv6) continue [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2016