tor-commits February 2021

tor-commits@lists.torproject.org

19 participants
1772 discussions

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit 36877312337b44d34ff7b1649cadc84aceb4df26 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:46:27 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- cs.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cs.po b/cs.po index f98d5c3da2..a6690d26de 100644 --- a/cs.po +++ b/cs.po @@ -8,6 +8,7 @@ # David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 # Fourdee Foureight, 2020 +# Jan Pechacek <jan386(a)gmail.com>, 2021 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 # trendspotter, 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-19 20:33+0000\n" +"Last-Translator: Jan Pechacek <jan386(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit 0c7fe16a46a28fa2150c38cc40e4763d859ecd99 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:45:48 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- cs.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/cs.po b/cs.po index 6c72b74485..9787b09f87 100644 --- a/cs.po +++ b/cs.po @@ -7,7 +7,8 @@ # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 # David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 -# Fourdee Foureight <x4D48(a)protonmail.ch>, 2020 +# Fourdee Foureight, 2020 +# Jan Pechacek <jan386(a)gmail.com>, 2021 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 # trendspotter, 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-19 20:33+0000\n" +"Last-Translator: Jan Pechacek <jan386(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -241,7 +242,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: {explanation}.\n" "\n" "To learn how to do a manual upgrade, go to {manual_upgrade_url}" -msgstr "" +msgstr "Měli byste provést ruční aktualizaci na {name}{version}.\n\nVíce informací o této nové verzi naleznete na {details_url}\n\nNení možné automaticky aktualizovat vaše zařízení na tuto novou verzi: {explanation}.\n\nChcete-li zjistit, jak provést ruční aktualizaci, podívejte se na {manual_upgrade_url}" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471 msgid "New version available" @@ -302,7 +303,7 @@ msgid "" "The network connection will be disabled when applying the upgrade.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "Aktualizace byla úspěšně stažena.\n\nSíťové připojení bude během provádění aktualizace vypnuto.\n\nUložte prosím svou práci a ukončete všechny ostatní aplikace." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700 msgid "Upgrade successfully downloaded" @@ -367,7 +368,7 @@ msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the network connection is now disabled." -msgstr "" +msgstr "Vaše zařízení Tails se právě aktualizuje...\n\nZ důvodu bezpečnosti je nyní síťové připojení vypnuto." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796 msgid "" @@ -537,7 +538,7 @@ msgstr "Zapsáno na zařízení rychlostí %(speed)d MB/s" msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to \"%(filename)s\"." -msgstr "" +msgstr "Vyskytl se problém při provádění následujícího příkazu: `%(command)s`.\nPodrobnější záznam o chybě byl zapsán do \"%(filename)s\"." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:424 #, python-format @@ -608,17 +609,17 @@ msgstr "Nenalezeny žádné body připojení" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:661 #, python-format msgid "Entering unmount_device for \"%(device)s\"" -msgstr "" +msgstr "Provádím unmount_device pro \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:670 #, python-format msgid "Unmounting mounted filesystems on \"%(device)s\"" -msgstr "" +msgstr "Odpojuji připojené systémy souborů na \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:674 #, python-format msgid "Unmounting \"%(udi)s\" on \"%(device)s\"" -msgstr "" +msgstr "Odpojuji \"%(udi)s\" na \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:685 #, python-format @@ -788,7 +789,7 @@ msgstr "Zařízení \"%(pretty_name)s\" je moc malé pro instalaci Tails (je vy msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "%(dl_url)s" -msgstr "" +msgstr "Pro aktualizaci zařízení \"%(pretty_name)s\" z této verze Tails budete muset použít stažený ISO obraz Tails:\n%(dl_url)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:513 msgid "An error happened while installing Tails" @@ -869,17 +870,17 @@ msgstr "Nastal problém při spouštění '%(cmd)s'.\n%(out)s\n%(err)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:64 #, python-format msgid "\"%s\" does not exist" -msgstr "" +msgstr "\"%s\" neexistuje" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:66 #, python-format msgid "\"%s\" is not a directory" -msgstr "" +msgstr "\"%s\" není adresář" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:77 #, python-format msgid "Skipping \"%(filename)s\"" -msgstr "" +msgstr "Přeskakuji \"%(filename)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/utils.py:54 #, python-format @@ -1592,7 +1593,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See {manual_upgrade_url}" -msgstr "" +msgstr "Není dostupný dostatek paměti pro kontrolu aktualizací.\n\nUjistěte se, že tento systém splňuje podmínky pro běh Tails.\nViz file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nZkuste restartovat Tails a znovu zkontrolovat aktualizace.\n\nNebo proveďte ruční aktualizaci.\nViz {manual_upgrade_url}" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 @@ -1617,7 +1618,7 @@ msgstr "Hostitelský operační systém i virtualizační software mohou monitor #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:40 msgid "Don't Show Again" -msgstr "" +msgstr "Příště nezobrazovat" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:42 msgid "Learn More"

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit df33d1e7eb2fdb145b7e7c2e3f7449ee7b4b936b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:45:21 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- cs/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cs/https-everywhere.dtd b/cs/https-everywhere.dtd index c092e0ecb6..3782dcc11f 100644 --- a/cs/https-everywhere.dtd +++ b/cs/https-everywhere.dtd @@ -49,8 +49,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "síťový degradační útok"> <!ENTITY https-everywhere.cancel.copy_url "Zkopírovat URL"> <!ENTITY https-everywhere.cancel.copied_url "Zkopírováno do schránky"> -<!ENTITY https-everywhere.cancel.open_page "Disable on this site"> -<!ENTITY https-everywhere.cancel.http_once "Proceed anyway (unsafe)"> +<!ENTITY https-everywhere.cancel.open_page "Vypnout na této stránce"> +<!ENTITY https-everywhere.cancel.http_once "Přesto pokračovat (nebezpečné)"> <!ENTITY https-everywhere.onboarding.intro "Šifrujte! Používejte automaticky zabezpečené HTTPS na mnoha stránkách."> <!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere byl aktualizován!"> @@ -63,8 +63,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Vynutit šifrovaná spojení pro tyto stránky:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentální pravidla"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Může způsobit upozornění nebo chyby. Zakázáno ve výchozím nastavení."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable on this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Vypnout na této stránce"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Zapnout na této stránce"> <!ENTITY https-everywhere.chrome.add_rule "Přidat pravidlo pro tuto stránku"> <!ENTITY https-everywhere.chrome.add_new_rule "Přidat nové pravidlo pro tuto stránku"> <!ENTITY https-everywhere.chrome.always_https_for_host "Pro tento server vždy používat https">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit adebde9fc79b4fd839827715c8d0305c719e7772 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 19:16:36 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu.po b/hu.po index 6102e47858..bff2e4c506 100644 --- a/hu.po +++ b/hu.po @@ -9,7 +9,7 @@ # Blackywantscookies, 2014 # Blackywantscookies, 2014 # 774f2855e7016a193f9916f715f8a14e_4f42736 <c37fb76cde6546c7b7a80bc0899da2f7_124500>, 2013 -# Kovacs Zeteny <vvv.big.ed(a)protonmail.com>, 2021 +# 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b <06435adb4e599f62423b0c8619c8eba7_967332>, 2021 # Lajos Pasztor <mrlajos(a)gmail.com>, 2014 # Robert Zsolt <physx_ms(a)outlook.com>, 2016 # vargaviktor <viktor.varga(a)gmail.com>, 2013,2015,2018-2020 @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" "PO-Revision-Date: 2021-02-15 22:55+0000\n" -"Last-Translator: Kovacs Zeteny <vvv.big.ed(a)protonmail.com>\n" +"Last-Translator: 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b <06435adb4e599f62423b0c8619c8eba7_967332>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-build/maint-10.0-desktop] Bug 40239: Don't download mar tools from old versions
by sysrqb＠torproject.org 19 Feb '21

19 Feb '21

commit 35227374db93e0b7d1e5a1f09afd1db4289e7c00 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 19 17:04:43 2021 +0100 Bug 40239: Don't download mar tools from old versions Before generating incremental mar files, we download mar files and mar-tools-linux64.zip from the previous version. However we use mar-tools from the new version and don't use the one from the old version, so there is no need to download it. --- tools/update-responses/update_responses | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index de24235..237a2be 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -565,21 +565,6 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-linux64.zip'; - exit_error "Error downloading $urldir/$martools\n" - unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; - exit_error "Error downloading $urldir/$martools.asc\n" - unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; - if (system('gpg', '--no-default-keyring', '--keyring', - "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/$martools.asc", "$tmpdir/$martools")) { - exit_error "Error checking gpg signature for $version/$martools"; - } - exit_error "Wrong checksum for $version/$martools" - unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); - move "$tmpdir/$martools", "$destdir/$martools"; - move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n"

1 0

[tor-browser-build/master] Bug 40239: Don't download mar tools from old versions
by sysrqb＠torproject.org 19 Feb '21

19 Feb '21

commit e979fe32266998a508821669a613f6101875bd51 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 19 17:04:43 2021 +0100 Bug 40239: Don't download mar tools from old versions Before generating incremental mar files, we download mar files and mar-tools-linux64.zip from the previous version. However we use mar-tools from the new version and don't use the one from the old version, so there is no need to download it. --- tools/update-responses/update_responses | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 35b971f..e897563 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -565,21 +565,6 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-linux64.zip'; - exit_error "Error downloading $urldir/$martools\n" - unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; - exit_error "Error downloading $urldir/$martools.asc\n" - unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; - if (system('gpg', '--no-default-keyring', '--keyring', - "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/$martools.asc", "$tmpdir/$martools")) { - exit_error "Error checking gpg signature for $version/$martools"; - } - exit_error "Wrong checksum for $version/$martools" - unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); - move "$tmpdir/$martools", "$destdir/$martools"; - move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n"

1 0

[sbws/master] fix: stem: Remove unused code
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit 553f4a8fa35a35b686c27a808671b0c1f0f76807 Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:27:55 2020 +0000 fix: stem: Remove unused code --- sbws/util/stem.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index d2c596f..746fa88 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -80,13 +80,6 @@ def init_controller(port=None, path=None, set_custom_stream_settings=True): if not c: return None, 'Unable to reach tor on control socket' assert c is not None - if set_custom_stream_settings: - # These options are also set in launch_tor. - # In a future refactor they could be set in the case they are not - # already in the running instance. This way the controller_port - # could also be used. - set_torrc_options_can_fail(c) - set_torrc_runtime_options(c) return c, ''

1 0

[sbws/master] chg: config: Add option to connect to external tor
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit f6e300c83508508a6f38abe76390f9c6c3de00a2 Author: juga0 <juga(a)riseup.net> Date: Wed Dec 16 15:14:48 2020 +0000 chg: config: Add option to connect to external tor via control port. --- docs/source/man_sbws.ini.rst | 4 ++++ sbws/config.default.ini | 1 + sbws/util/config.py | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index f878ce8..e2127ab 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -93,6 +93,10 @@ tor sbws's owned tor pid file. (Default: ~/.sbws/tor/sbws/tor.pid) log = STR sbws's owned tor directory log files. (Default: ~/.sbws/tor/log) + external_control_port = INT + tor control port to connect to. Useful to run integration tests with + chutney. + (Default: not set. If set, it takes preference over the control socket) extra_lines = sbws's tor extra configuration. (Default: None) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index cb943d0..0105527 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -66,6 +66,7 @@ control_socket = ${tor:run_dpath}/control pid = ${tor:run_dpath}/tor.pid # note this is a directory log = ${tor:datadir}/log +external_control_port = extra_lines = [cleanup] diff --git a/sbws/util/config.py b/sbws/util/config.py index e1bc429..5ba3fd5 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -323,7 +323,9 @@ def _validate_tor(conf): sec = 'tor' err_tmpl = Template('$sec/$key ($val): $e') unvalidated_keys = [ - 'datadir', 'run_dpath', 'control_socket', 'pid', 'log', 'extra_lines'] + 'datadir', 'run_dpath', 'control_socket', 'pid', 'log', + 'external_control_port', 'extra_lines', + ] all_valid_keys = unvalidated_keys errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl)) return errors

1 0

[sbws/master] fix: doc: Update values in config_tor.rst + clean-up
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit 17e6eca63645271cbf2f5553b1a71aafd3f542cd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 7 14:38:00 2021 +0000 fix: doc: Update values in config_tor.rst + clean-up Closes #40035. --- docs/source/config_tor.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst index 175a9ff..e609468 100644 --- a/docs/source/config_tor.rst +++ b/docs/source/config_tor.rst @@ -3,7 +3,7 @@ Internal Tor configuration for the scanner ------------------------------------------ -The scanner needs an specific Tor configuration. +The scanner needs a specific Tor configuration. The following options are either set when launching Tor or required when connection to an existing Tor daemon. @@ -16,6 +16,9 @@ Default configuration: - ``SafeLogging 0``: Useful for logging, since there's no need for anonymity. - ``LogTimeGranularity 1`` - ``ProtocolWarnings 1`` +- ``FetchDirInfoEarly 1`` +- ``FetchDirInfoExtraEarly 1``: Respond to `MaxAdvertisedBandwidth` as soon as possible. +- ``FetchUselessDescriptors 1``: Keep fetching descriptors, even when idle. - ``LearnCircuitBuildTimeout 0``: To keep circuit build timeouts static. Configuration that depends on the user configuration file: @@ -29,9 +32,13 @@ Configuration that depends on the user configuration file: Configuration that needs to be set on runtime: - ``__DisablePredictedCircuits 1``: To build custom circuits. -- ``__LeaveStreamsUnattached 1`` +- ``__LeaveStreamsUnattached 1``: The scanner is attaching the streams itself. + +Configuration that can be set on runtime and fail: + +- ``ConnectionPadding 0``: Useful for avoiding extra traffic, since scanner anonymity is not a goal. Currently most of the code that sets this configuration is in :func:`sbws.util.stem.launch_tor` and the default configuration is ``sbws/globals.py``. -.. note:: the location of these code is being refactored. \ No newline at end of file +.. note:: the location of this code is being refactored.

1 0

[sbws/master] fix: relaylist: Stop measuring relays not in the consenus
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit a050110db59d136f6f46809c4b18fe487012e546 Author: juga0 <juga(a)riseup.net> Date: Mon Dec 21 16:24:50 2020 +0000 fix: relaylist: Stop measuring relays not in the consenus as this might cause many circuit errors. They're already added to the generator. Also adapt the number in test_init_relays. Closes: #40037. Happy solstice! :) --- sbws/lib/relaylist.py | 17 +++++------------ tests/unit/lib/test_relaylist.py | 8 ++++---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 8a07ce7..640e3eb 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -14,7 +14,7 @@ from ..globals import ( MAX_RECENT_PRIORITY_LIST_COUNT, MEASUREMENTS_PERIOD ) -from ..util import timestamp, timestamps +from ..util import timestamps log = logging.getLogger(__name__) @@ -250,12 +250,6 @@ class Relay: def relay_recent_priority_list_count(self): return len(self.relay_recent_priority_list) - def is_old(self): - """Whether the last consensus seen for this relay is older than the - measurement period. - """ - return timestamp.is_old(self.last_consensus_timestamp) - # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last # descriptors seen for this relay and the timestamp. def update_server_descriptor(self, server_descriptor): @@ -417,11 +411,10 @@ class RelayList: # already added to the new list. new_relays_dict.pop(fp) - # If the relay is not in the current consensus but is not "old" - # yet, add it to the new list of relays too, though its timestamp, - # router status and descriptor can't be updated. - elif not r.is_old(): - new_relays.append(r) + # In #30727, the relay that is not in the current conensus but is + # not "old", was added to the new list of relays too. + # In #40037 we think it should not be measured, as it might cause + # many circuit errors. It's already added to the generator. # Otherwise, don't add it to the new list of relays. # For debugging, count the old relays that will be discarded. else: diff --git a/tests/unit/lib/test_relaylist.py b/tests/unit/lib/test_relaylist.py index 31673ba..399d897 100644 --- a/tests/unit/lib/test_relaylist.py +++ b/tests/unit/lib/test_relaylist.py @@ -51,7 +51,7 @@ def test_init_relays( assert 6505 == 6433 + len(added_fps) # The calculated min bw for the second hop assert 2120000 == relay_list._exit_min_bw - assert 200000 == relay_list._non_exit_min_bw + assert 210000 == relay_list._non_exit_min_bw # Five days later plus 1 second. # The first consensus timestamp will get removed. @@ -69,10 +69,10 @@ def test_init_relays( removed_fps = fps.difference(fps_5days_later) # The number of relays will be the number of relays in the cosensus plus # the added ones minus the removed ones. - assert 6925 == 6505 + len(added_fps) - len(removed_fps) + assert 6596 == 6505 + len(added_fps) - len(removed_fps) # The calculated min bw for the second hop - assert 2790000 == relay_list._exit_min_bw - assert 110000 == relay_list._non_exit_min_bw + assert 2800000 == relay_list._exit_min_bw + assert 150000 == relay_list._non_exit_min_bw def test_increment_recent_measurement_attempt(args, conf, controller):

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2021