- tor-commits - lists.torproject.org

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 29 Feb '16

29 Feb '16

commit 5e8101c11e427d7b139c85023f9d15f8bef176d2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 28 21:45:54 2016 +0000 Update translations for torbutton-torbuttondtd --- sw/torbutton.dtd | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sw/torbutton.dtd b/sw/torbutton.dtd index a1a2cb8..c75a6d7 100644 --- a/sw/torbutton.dtd +++ b/sw/torbutton.dtd @@ -1,17 +1,17 @@ -<!ENTITY torbutton.prefs.title "Torbutton Preferences"> -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy"> +<!ENTITY torbutton.prefs.title "Mapendeleo ya Torbutton"> +<!ENTITY torbutton.prefs.tor_settings "Mapendeleo ya Proxy"> +<!ENTITY torbutton.prefs.recommended_settings "Tumia mapendeleo yaliyopendekezwa kwa toleo langu la Firefox"> +<!ENTITY torbutton.prefs.use_privoxy "Tumia Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> +<!ENTITY torbutton.prefs.custom_settings "Tumia mapandeleo tofauti ya proxy"> <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> <!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.about.title "About Torbutton"> -<!ENTITY torbutton.about.version "Version:"> +<!ENTITY torbutton.prefs.proxy.port "Kituo:"> +<!ENTITY torbutton.about.title "Kuhusu Torbutton"> +<!ENTITY torbutton.about.version "Toleo:"> <!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing."> <!ENTITY torbutton.about.code "Code Contributors:"> <!ENTITY torbutton.about.maintainer "Maintainer:"> @@ -102,7 +102,7 @@ <!ENTITY torbutton.prefs.startup "Startup"> <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> +<!ENTITY torbutton.prefs.restore_defaults "Rejesha chaguo-msingi"> <!ENTITY torbutton.prefs.test_settings "Test Settings"> <!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> @@ -148,14 +148,14 @@ <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Zuia plugins za kisakuzi (kama vile Flash)"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Badilisha sifa zinazokutofautisha na wengine wanaotumia kisakuzi cha Tor"> +<!ENTITY torbutton.prefs.sec_caption "Kiwango cha Usalama"> +<!ENTITY torbutton.prefs.sec_low "Chini (chaguo-msingi)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> +<!ENTITY torbutton.prefs.sec_low_desc "Katika kiwango hiki cha usalama, vipengele vyote vya kisakuzi vimewezeshwa"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> +<!ENTITY torbutton.prefs.sec_gen_desc "Katika kiwango hiki cha usalama, mabadilko haya yanafanyika (amba juu na kipanya kwa maelezo)"> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> @@ -180,6 +180,6 @@ <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_custom "Vipengele maalum"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 29 Feb '16

29 Feb '16

commit 3862d8e4f05b1ed4857851d5a261c76ef7e5b79f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 28 21:16:22 2016 +0000 Update translations for tor-messenger-authdtd --- sw/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/auth.dtd b/sw/auth.dtd index 8df5727..9a0594c 100644 --- a/sw/auth.dtd +++ b/sw/auth.dtd @@ -1,7 +1,7 @@ <!ENTITY authDialog.title "Verify contact's identity"> <!ENTITY authDialog.authenticate "Verify"> <!ENTITY authDialog.cancel "Cancel"> -<!ENTITY authDialog.help "Help"> +<!ENTITY authDialog.help "Usaidizi"> <!ENTITY authDialog.yes "Yes"> <!ENTITY authDialog.no "No"> <!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint.">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 29 Feb '16

29 Feb '16

commit b1ce6206aaeb397388b8f642aefa55d7f123e369 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 28 21:16:01 2016 +0000 Update translations for torbutton-torbuttondtd --- sw/torbutton.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sw/torbutton.dtd b/sw/torbutton.dtd index 32c680f..a1a2cb8 100644 --- a/sw/torbutton.dtd +++ b/sw/torbutton.dtd @@ -19,8 +19,8 @@ <!ENTITY torbutton.about.donate "If you like using Tor, you might consider"> <!ENTITY torbutton.about.make_donation "making a donation."> <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> +<!ENTITY torbutton.pref_connection.more_info "Maelezo zaidi"> +<!ENTITY torbutton.pref_connection_more_info.title "Usaidizi"> <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> @@ -133,11 +133,11 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -<!ENTITY torbutton.prefs.dtd_recommended "(recommended)"> +<!ENTITY torbutton.prefs.dtd_recommended "(imependekezwa)"> <!ENTITY torbutton.prefs.dtd_optional "(optional)"> -<!ENTITY torbutton.prefs.dtd_crucial "(crucial)"> +<!ENTITY torbutton.prefs.dtd_crucial "(muhimu)"> <!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor"> -<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:"> +<!ENTITY torbutton.prefs.dodge_google_captcha "Tumia injini tafuti nyingine kiautomatiki unapowasilishwa na Google Captcha:"> <!ENTITY torbutton.prefs.engine1 "ixquick.com"> <!ENTITY torbutton.prefs.engine2 "Bing.com"> <!ENTITY torbutton.prefs.engine3 "Yahoo.com"> @@ -147,7 +147,7 @@ <!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> +<!ENTITY torbutton.prefs.block_plugins "Zuia plugins za kisakuzi (kama vile Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!ENTITY torbutton.prefs.sec_low "Low (default)">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 29 Feb '16

29 Feb '16

commit 07296c1869e853e72a7d993b3d86090be3ef66d1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 28 21:15:39 2016 +0000 Update translations for tor-launcher-properties --- sw/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/torlauncher.properties b/sw/torlauncher.properties index 02be756..8a09482 100644 --- a/sw/torlauncher.properties +++ b/sw/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(imependekezwa) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 29 Feb '16

29 Feb '16

commit 5d9d3a7dfa20ca5bc79f67d60b1d7d51df2f3b05 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 28 21:15:11 2016 +0000 Update translations for whisperback --- sw/sw.po | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index 0d36614..b732454 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-08-01 15:36+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-16 19:54+0100\n" "PO-Revision-Date: 2012-02-26 16:11+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: Swahili (http://www.transifex.com/projects/p/torproject/language/sw/)\n" +"Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,17 +18,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. XXX use a better exception -#: ../whisperBack/whisperback.py:63 +#: ../whisperBack/whisperback.py:56 #, python-format msgid "Invalid contact email: %s" msgstr "" -#: ../whisperBack/whisperback.py:80 +#: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" msgstr "" -#: ../whisperBack/whisperback.py:82 +#: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" msgstr "" @@ -39,40 +39,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "" -#: ../whisperBack/gui.py:154 +#: ../whisperBack/gui.py:148 msgid "Unable to load a valid configuration." msgstr "" -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:214 msgid "Sending mail..." msgstr "" -#: ../whisperBack/gui.py:221 +#: ../whisperBack/gui.py:215 msgid "Sending mail" msgstr "" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:223 +#: ../whisperBack/gui.py:217 msgid "This could take a while..." msgstr "" -#: ../whisperBack/gui.py:237 +#: ../whisperBack/gui.py:232 msgid "The contact email adress doesn't seem valid." msgstr "" -#: ../whisperBack/gui.py:254 +#: ../whisperBack/gui.py:249 msgid "Unable to send the mail: SMTP error." msgstr "" -#: ../whisperBack/gui.py:256 +#: ../whisperBack/gui.py:251 msgid "Unable to connect to the server." msgstr "" -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:253 msgid "Unable to create or to send the mail." msgstr "" -#: ../whisperBack/gui.py:261 +#: ../whisperBack/gui.py:256 msgid "" "\n" "\n" @@ -81,21 +81,20 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "" -#: ../whisperBack/gui.py:274 +#: ../whisperBack/gui.py:269 msgid "Your message has been sent." msgstr "" -#: ../whisperBack/gui.py:281 +#: ../whisperBack/gui.py:276 msgid "An error occured during encryption." msgstr "" -#: ../whisperBack/gui.py:301 +#: ../whisperBack/gui.py:296 #, python-format msgid "Unable to save %s." msgstr "" -#. XXX: fix string -#: ../whisperBack/gui.py:325 +#: ../whisperBack/gui.py:319 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -105,27 +104,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "" -#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "" -#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "" -#: ../whisperBack/gui.py:393 +#: ../whisperBack/gui.py:383 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "" -#: ../whisperBack/gui.py:394 +#: ../whisperBack/gui.py:384 msgid "Tails developers <tails(a)boum.org>" msgstr "" -#: ../whisperBack/gui.py:395 +#: ../whisperBack/gui.py:385 msgid "translator-credits" msgstr "" -#: ../whisperBack/gui.py:422 +#: ../whisperBack/gui.py:412 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr ""

1 0

[stem/master] Tor manual now has TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries
by atagar＠torproject.org 29 Feb '16

29 Feb '16

commit 7ee9347844f7cb28360aa0a06c97ba345be51f97 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 28 10:22:00 2016 -0800 Tor manual now has TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries Resyncing cached data. We can drop a hack from our tests now that https://trac.torproject.org/projects/tor/ticket/17913 is merged. --- docs/change_log.rst | 1 + stem/cached_tor_manual.cfg | 9 +- stem/descriptor/fallback_directories.cfg | 140 ++++++++++++++++++++----------- test/integ/manual.py | 3 - 4 files changed, 98 insertions(+), 55 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 7af44da..57667e1 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -67,6 +67,7 @@ The following are only available within Stem's `git repository * Unable to read descriptors from data directories on Windows due to their CRLF newlines (:trac:`17051`) * TypeError under python3 when using 'use_mirrors = True' (:trac:`17083`) * Deprecated hidden service descriptor's *introduction_points_auth* field, which was never implemented in tor (:trac:`15190`, :spec:`9c218f9`) + * :func:`~stem.control.Controller.get_hidden_service_descriptor` errored when provided a *servers* argument (:trac:`18401`) * Fixed parsing of server descriptor's *allow-single-hop-exits* and *caches-extra-info* lines * Bracketed IPv6 addresses were mistreated as being invalid content * Updated dannenberg's v3ident (:trac:`17906`) diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg index 7a98873..a2dbaf7 100644 --- a/stem/cached_tor_manual.cfg +++ b/stem/cached_tor_manual.cfg @@ -6,8 +6,8 @@ description |Basically, Tor provides a distributed network of servers or relays ("onion routers"). Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream. | |By default, tor will only act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website. -man_commit ba2be81fc36ba6140247873799b747605fb07bd4 -stem_commit fc35ea1a74b6f9a95b6d1c2d21069f837dc725bb +man_commit af88e8f23742c810f478410fba60c43812dde85d +stem_commit 988aeb121b762f58712bda078d1f13ffa0819bfb commandline_options -f FILE => Specify a new configuration file to contain further Tor configuration options OR pass - to make Tor read its configuration from standard input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) commandline_options --ignore-missing-torrc => Specifies that Tor should treat a missing torrc file as though it were empty. Ordinarily, Tor does this for missing default torrc files, but not for those specified on the command line. commandline_options --list-fingerprint => Generate your keys and output your nickname and fingerprint. @@ -1611,6 +1611,11 @@ config_options.TestingClientBootstrapConsensusMaxDownloadTries.name TestingClien config_options.TestingClientBootstrapConsensusMaxDownloadTries.usage NUM config_options.TestingClientBootstrapConsensusMaxDownloadTries.summary Number of times to attempt downloading consensus config_options.TestingClientBootstrapConsensusMaxDownloadTries.description Try this many times to download a consensus while bootstrapping using fallback directory mirrors before giving up. Changing this requires that TestingTorNetwork is set. (Default: 7) +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.category Testing +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.name TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.usage NUM +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.summary +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.description Try this many times to download a consensus while bootstrapping using authorities before giving up. Changing this requires that TestingTorNetwork is set. (Default: 4) config_options.TestingClientBootstrapConsensusMaxInProgressTries.category Testing config_options.TestingClientBootstrapConsensusMaxInProgressTries.name TestingClientBootstrapConsensusMaxInProgressTries config_options.TestingClientBootstrapConsensusMaxInProgressTries.usage NUM diff --git a/stem/descriptor/fallback_directories.cfg b/stem/descriptor/fallback_directories.cfg index 158378d..91fd02a 100644 --- a/stem/descriptor/fallback_directories.cfg +++ b/stem/descriptor/fallback_directories.cfg @@ -1,13 +1,9 @@ -tor_commit ab3c86479a516073e0b445846a22b0e24ce8078e -stem_commit 645017a5f8c17b143e90602fdfe6c03a1a994a1c +tor_commit e2202146d16af22502fd4166ac926fefa6528dff +stem_commit 988aeb121b762f58712bda078d1f13ffa0819bfb Doedel22.address 178.254.44.135 Doedel22.or_port 9001 Doedel22.dir_port 9030 Doedel22.fingerprint 8FA37B93397015B2BC5A525C908485260BE9F422 -tornoderdednl.address 178.62.199.226 -tornoderdednl.or_port 443 -tornoderdednl.dir_port 80 -tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE Logforme.address 84.219.173.60 Logforme.or_port 443 Logforme.dir_port 9030 @@ -16,50 +12,50 @@ Doedel21.address 178.254.44.135 Doedel21.or_port 443 Doedel21.dir_port 80 Doedel21.fingerprint AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2 -BabylonNetwork02.address 149.202.98.161 -BabylonNetwork02.or_port 443 -BabylonNetwork02.dir_port 80 -BabylonNetwork02.fingerprint 54660C671B47E6986B465B80444414BD19E5A34B +kitten4.address 212.47.237.95 +kitten4.or_port 9101 +kitten4.dir_port 9130 +kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88 +kitten3.address 212.47.237.95 +kitten3.or_port 9001 +kitten3.dir_port 9030 +kitten3.fingerprint 3F5D8A879C58961BB45A3D26AC41B543B40236D6 +Unnamed.address 217.12.199.208 +Unnamed.or_port 443 +Unnamed.dir_port 80 +Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05 +coby.address 51.255.33.237 +coby.or_port 9001 +coby.dir_port 9091 +coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109 +Binnacle.address 108.53.208.157 +Binnacle.or_port 443 +Binnacle.dir_port 80 +Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2 fluxe3.address 78.47.18.110 fluxe3.or_port 80 fluxe3.dir_port 443 fluxe3.fingerprint F8D27B163B9247B232A2EEE68DD8B698695C28DE -kili.address 178.62.173.203 -kili.or_port 9001 -kili.dir_port 9030 -kili.fingerprint DD85503F2D1F52EF9EAD621E942298F46CD2FC10 +rueckgrat.address 5.9.110.236 +rueckgrat.or_port 9001 +rueckgrat.dir_port 9030 +rueckgrat.fingerprint 0756B7CD4DFC8182BE23143FAC0642F515182CEB +Nurnberg01.address 213.239.210.204 +Nurnberg01.or_port 443 +Nurnberg01.dir_port 22 +Nurnberg01.fingerprint 5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9 wagner.address 5.175.233.86 wagner.or_port 443 wagner.dir_port 80 wagner.fingerprint 5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 -fluxe4.address 131.188.40.188 -fluxe4.or_port 80 -fluxe4.dir_port 443 -fluxe4.fingerprint EBE718E1A49EE229071702964F8DB1F318075FF8 kitten2.address 62.210.124.124 kitten2.or_port 9101 kitten2.dir_port 9130 kitten2.fingerprint 2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E -coby.address 51.255.33.237 -coby.or_port 9001 -coby.dir_port 9091 -coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109 -GrmmlLitavis.address 5.39.88.19 -GrmmlLitavis.or_port 9001 -GrmmlLitavis.dir_port 9030 -GrmmlLitavis.fingerprint 7CB8C31432A796731EA7B6BF4025548DFEB25E0C -Doedel24.address 178.254.20.134 -Doedel24.or_port 9001 -Doedel24.dir_port 9030 -Doedel24.fingerprint 2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC -BabylonNetwork03.address 193.111.136.162 -BabylonNetwork03.or_port 443 -BabylonNetwork03.dir_port 80 -BabylonNetwork03.fingerprint C79552275DFCD486B942510EF663ED36ACA1A84B -Unnamed.address 217.12.199.208 -Unnamed.or_port 443 -Unnamed.dir_port 80 -Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05 +Nurnberg02.address 213.239.220.25 +Nurnberg02.or_port 443 +Nurnberg02.dir_port 22 +Nurnberg02.fingerprint BEE2317AE127EB681C5AE1551C1EA0630580638A eriador.address 85.25.138.93 eriador.or_port 4029 eriador.dir_port 9030 @@ -68,19 +64,63 @@ Doedel26.address 178.254.20.134 Doedel26.or_port 443 Doedel26.dir_port 80 Doedel26.fingerprint 9F5068310818ED7C70B0BC4087AB55CB12CB4377 -PedicaboMundi.address 144.76.14.145 -PedicaboMundi.or_port 143 -PedicaboMundi.dir_port 110 -PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB kitten1.address 62.210.124.124 kitten1.or_port 9001 kitten1.dir_port 9030 kitten1.fingerprint 86E78DD3720C78DA8673182EF96C54B162CD660C -Binnacle.address 108.53.208.157 -Binnacle.or_port 443 -Binnacle.dir_port 80 -Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2 -kitten4.address 212.47.237.95 -kitten4.or_port 9101 -kitten4.dir_port 9130 -kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88 +bakunin.address 178.16.208.57 +bakunin.or_port 443 +bakunin.dir_port 80 +bakunin.fingerprint 92CFD9565B24646CAC2D172D3DB503D69E777B8A +PedicaboMundi.address 144.76.14.145 +PedicaboMundi.or_port 143 +PedicaboMundi.dir_port 110 +PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB +tornoderdednl.address 178.62.199.226 +tornoderdednl.or_port 443 +tornoderdednl.dir_port 80 +tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE +ratchet.address 170.130.1.7 +ratchet.or_port 9001 +ratchet.dir_port 9030 +ratchet.fingerprint FA3415659444AE006E7E9E5375E82F29700CFDFD +Freebird32.address 178.254.13.126 +Freebird32.or_port 9001 +Freebird32.dir_port 9030 +Freebird32.fingerprint 0C475BA4D3AA3C289B716F95954CAD616E50C4E5 +Freebird31.address 178.254.13.126 +Freebird31.or_port 443 +Freebird31.dir_port 80 +Freebird31.fingerprint F9246DEF2B653807236DA134F2AEAB103D58ABFE +12xBTME1.address 81.7.17.171 +12xBTME1.or_port 443 +12xBTME1.dir_port 80 +12xBTME1.fingerprint 00C4B4731658D3B4987132A3F77100CFCB190D97 +kili.address 178.62.173.203 +kili.or_port 9001 +kili.dir_port 9030 +kili.fingerprint DD85503F2D1F52EF9EAD621E942298F46CD2FC10 +fluxe4.address 131.188.40.188 +fluxe4.or_port 80 +fluxe4.dir_port 443 +fluxe4.fingerprint EBE718E1A49EE229071702964F8DB1F318075FF8 +pixelminer.address 81.7.14.246 +pixelminer.or_port 443 +pixelminer.dir_port 80 +pixelminer.fingerprint CE75BF0972ADD52AF8807602374E495C815DB304 +Nurnberg04.address 88.198.38.226 +Nurnberg04.or_port 443 +Nurnberg04.dir_port 22 +Nurnberg04.fingerprint 4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB +Nurnberg03.address 85.10.201.38 +Nurnberg03.or_port 443 +Nurnberg03.dir_port 22 +Nurnberg03.fingerprint F6279A203C1950ACF592322A235647A05BFBCF91 +Doedel24.address 178.254.20.134 +Doedel24.or_port 9001 +Doedel24.dir_port 9030 +Doedel24.fingerprint 2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC +horizons.address 167.114.35.28 +horizons.or_port 9001 +horizons.dir_port 9030 +horizons.fingerprint E65D300F11E1DB12C534B0146BDAB6972F1A8A48 diff --git a/test/integ/manual.py b/test/integ/manual.py index d877c74..d20c407 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -302,9 +302,6 @@ class TestManual(unittest.TestCase): missing_from_manual = config_options_in_tor.difference(config_options_in_manual) - if 'TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries' in missing_from_manual: - missing_from_manual.remove('TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries') # https://trac.torproject.org/projects/tor/ticket/17913 - if missing_from_manual: self.fail("The %s config options supported by tor isn't in its man page. Maybe we need to add them?" % ', '.join(missing_from_manual))

1 0

[tor/master] clean/extend some module docs, including fix from #18403
by nickm＠torproject.org 29 Feb '16

29 Feb '16

commit 9fc472e1a8a53a18dfbd5c9cde2f1c268c335e96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 28 17:57:47 2016 +0100 clean/extend some module docs, including fix from #18403 --- src/common/backtrace.c | 5 +++++ src/common/compat.c | 2 +- src/common/crypto.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index eac54e0..3b762b6 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -6,6 +6,11 @@ * * \brief Functions to produce backtraces on bugs, crashes, or assertion * failures. + * + * Currently, we've only got an implementation here using the backtrace() + * family of functions, which are sometimes provided by libc and sometimes + * provided by libexecinfo. We tie into the sigaction() backend in order to + * detect crashes. */ #define __USE_GNU diff --git a/src/common/compat.c b/src/common/compat.c index 6f3e1e6..af61f02 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -6,7 +6,7 @@ /** * \file compat.c * \brief Wrappers to make calls more portable. This code defines - * functions such as tor_malloc, tor_snprintf, get/set various data types, + * functions such as tor_snprintf, get/set various data types, * renaming, setting socket options, switching user IDs. It is basically * where the non-portable items are conditionally included depending on * the platform. diff --git a/src/common/crypto.c b/src/common/crypto.c index b031624..11f8e1d 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -7,7 +7,8 @@ /** * \file crypto.c * \brief Wrapper functions to present a consistent interface to - * public-key and symmetric cryptography operations from OpenSSL. + * public-key and symmetric cryptography operations from OpenSSL and + * other places. **/ #include "orconfig.h"

1 0

[tor/master] Merge remote-tracking branch 'teor/fallbacks-201602-v2'
by nickm＠torproject.org 29 Feb '16

29 Feb '16

commit 69fc025e956f5a87db0860a1be54e6d3612c8074 Merge: 88ad2f5 e220214 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 28 15:51:22 2016 +0100 Merge remote-tracking branch 'teor/fallbacks-201602-v2' scripts/maint/fallback.whitelist | 4 +- scripts/maint/updateFallbackDirs.py | 92 ++++++++++- src/or/fallback_dirs.inc | 320 +++++++++++++++++++++++------------- 3 files changed, 294 insertions(+), 122 deletions(-)

1 0

[tor/master] Check if fallback directories can serve the consensus fast enough
by nickm＠torproject.org 29 Feb '16

29 Feb '16

commit 95800369863824d8fd255f45ae3586cd88611587 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sat Feb 27 10:02:49 2016 +0100 Check if fallback directories can serve the consensus fast enough --- scripts/maint/updateFallbackDirs.py | 79 ++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index fd7d350..884d566 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -26,11 +26,17 @@ import dateutil.parser # bson_lazy provides bson #from bson import json_util +from stem.descriptor.remote import DescriptorDownloader + import logging logging.basicConfig(level=logging.DEBUG) ## Top-Level Configuration +# Perform DirPort checks over IPv6? +# If you know IPv6 works for you, set this to True +PERFORM_IPV6_DIRPORT_CHECKS = False + # Output all candidate fallbacks, or only output selected fallbacks? OUTPUT_CANDIDATES = False @@ -84,6 +90,16 @@ CUTOFF_GUARD = .95 # .00 means no bad exits PERMITTED_BADEXIT = .00 +# Clients will time out after 30 seconds trying to download a consensus +# So allow fallback directories half that to deliver a consensus +# The exact download times might change based on the network connection +# running this script, but only by a few seconds +# There is also about a second of python overhead +CONSENSUS_DOWNLOAD_SPEED_MAX = 15.0 +# If the relay fails a consensus check, retry the download +# This avoids delisting a relay due to transient network conditions +CONSENSUS_DOWNLOAD_RETRY = True + ## List Length Limits # The target for these parameters is 20% of the guards in the network @@ -802,7 +818,57 @@ class Candidate(object): def original_fallback_weight_fraction(self, total_weight): return float(self.original_consensus_weight()) / total_weight - def fallbackdir_line(self, total_weight, original_total_weight): + @staticmethod + def fallback_consensus_dl_speed(dirip, dirport, nickname, max_time): + downloader = DescriptorDownloader() + start = datetime.datetime.utcnow() + # there appears to be about 1 second of overhead when comparing stem's + # internal trace time and the elapsed time calculated here + downloader.get_consensus(endpoints = [(dirip, dirport)]).run() + elapsed = (datetime.datetime.utcnow() - start).total_seconds() + if elapsed > max_time: + status = 'too slow' + else: + status = 'ok' + logging.debug(('Consensus download: %0.2fs %s from %s (%s:%d), ' + + 'max download time %0.2fs.') % (elapsed, status, + nickname, dirip, dirport, + max_time)) + return elapsed + + def fallback_consensus_dl_check(self): + ipv4_speed = Candidate.fallback_consensus_dl_speed(self.dirip, + self.dirport, + self._data['nickname'], + CONSENSUS_DOWNLOAD_SPEED_MAX) + if self.ipv6addr is not None and PERFORM_IPV6_DIRPORT_CHECKS: + # Clients assume the IPv6 DirPort is the same as the IPv4 DirPort + ipv6_speed = Candidate.fallback_consensus_dl_speed(self.ipv6addr, + self.dirport, + self._data['nickname'], + CONSENSUS_DOWNLOAD_SPEED_MAX) + else: + ipv6_speed = None + # Now retry the relay if it took too long the first time + if (ipv4_speed > CONSENSUS_DOWNLOAD_SPEED_MAX + and CONSENSUS_DOWNLOAD_RETRY): + ipv4_speed = Candidate.fallback_consensus_dl_speed(self.dirip, + self.dirport, + self._data['nickname'], + CONSENSUS_DOWNLOAD_SPEED_MAX) + if (self.ipv6addr is not None and PERFORM_IPV6_DIRPORT_CHECKS + and ipv6_speed > CONSENSUS_DOWNLOAD_SPEED_MAX + and CONSENSUS_DOWNLOAD_RETRY): + ipv6_speed = Candidate.fallback_consensus_dl_speed(self.ipv6addr, + self.dirport, + self._data['nickname'], + CONSENSUS_DOWNLOAD_SPEED_MAX) + + return (ipv4_speed <= CONSENSUS_DOWNLOAD_SPEED_MAX + and (not PERFORM_IPV6_DIRPORT_CHECKS + or ipv6_speed <= CONSENSUS_DOWNLOAD_SPEED_MAX)) + + def fallbackdir_line(self, total_weight, original_total_weight, dl_speed_ok): # /* # nickname # flags @@ -813,6 +879,7 @@ class Candidate(object): # "address:dirport orport=port id=fingerprint" # "[ipv6=addr:orport]" # "weight=num", + # # Multiline C comment s = '/*' s += '\n' @@ -839,6 +906,10 @@ class Candidate(object): s += '\n' s += '*/' s += '\n' + # Comment out the fallback directory entry if it's too slow + # See the debug output for which address and port is failing + if not dl_speed_ok: + s += '/* Consensus download failed or was too slow:\n' # Multi-Line C string with trailing comma (part of a string list) # This makes it easier to diff the file, and remove IPv6 lines using grep # Integers don't need escaping @@ -852,6 +923,9 @@ class Candidate(object): cleanse_c_string(self.ipv6addr), cleanse_c_string(self.ipv6orport)) s += '\n' s += '" weight=%d",'%(weight) + if not dl_speed_ok: + s += '\n' + s += '*/' return s ## Fallback Candidate List Class @@ -1249,7 +1323,8 @@ def list_fallbacks(): print describe_fetch_source(s) for x in candidates.fallbacks[:max_count]: - print x.fallbackdir_line(total_weight, pre_clamp_total_weight) + dl_speed_ok = x.fallback_consensus_dl_check() + print x.fallbackdir_line(total_weight, pre_clamp_total_weight, dl_speed_ok) #print json.dumps(candidates[x]._data, sort_keys=True, indent=4, # separators=(',', ': '), default=json_util.default)

1 0

[tor/master] Fix minor fallback directory script issues with time zones
by nickm＠torproject.org 29 Feb '16

29 Feb '16

commit a6017d61e18c4705637bd2c84425cfc2e3daa875 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sat Feb 27 10:03:17 2016 +0100 Fix minor fallback directory script issues with time zones --- scripts/maint/updateFallbackDirs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 884d566..63aaeed 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -360,6 +360,7 @@ def onionoo_fetch(what, **kwargs): # Check for freshness if last_mod < required_freshness: if last_mod_date is not None: + # This check sometimes fails transiently, retry the script if it does date_message = "Outdated data: last updated " + last_mod_date else: date_message = "No data: never downloaded " @@ -406,7 +407,7 @@ def fetch(what, **kwargs): ## Fallback Candidate Class class Candidate(object): - CUTOFF_ADDRESS_AND_PORT_STABLE = (datetime.datetime.now() + CUTOFF_ADDRESS_AND_PORT_STABLE = (datetime.datetime.utcnow() - datetime.timedelta(ADDRESS_AND_PORT_STABLE_DAYS)) def __init__(self, details): @@ -599,7 +600,7 @@ class Candidate(object): periods = history.keys() periods.sort(key = lambda x: history[x]['interval']) - now = datetime.datetime.now() + now = datetime.datetime.utcnow() newest = now for p in periods: h = history[p]

1 0