December 2019 - tor-commits - lists.torproject.org

[torspec/master] add nsf acks to four proposals
by arma＠torproject.org 13 Dec '19

13 Dec '19

commit a51495cdd71ba0eed72f57eb02274761ce95f7e0 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Dec 13 15:44:01 2019 -0500 add nsf acks to four proposals --- proposals/300-walking-onions.txt | 2 ++ proposals/302-padding-machines-for-onion-clients.txt | 4 ++++ proposals/305-establish-intro-dos-defense-extention.txt | 4 ++++ proposals/307-onionbalance-v3.txt | 2 ++ 4 files changed, 12 insertions(+) diff --git a/proposals/300-walking-onions.txt b/proposals/300-walking-onions.txt index 0192c2e..ece0c0a 100644 --- a/proposals/300-walking-onions.txt +++ b/proposals/300-walking-onions.txt @@ -499,6 +499,8 @@ A.1. Acknowledgments Thanks to David Goulet, Teor, and George Kadianakis for commentary on earlier versions of this draft. + This research was supported by NSF grants CNS-1526306 and CNS-1619454. + A.2. Additional ideas Teor notes that there are ways to try to get this idea to apply to diff --git a/proposals/302-padding-machines-for-onion-clients.txt b/proposals/302-padding-machines-for-onion-clients.txt index 4123e85..cd24298 100644 --- a/proposals/302-padding-machines-for-onion-clients.txt +++ b/proposals/302-padding-machines-for-onion-clients.txt @@ -291,6 +291,10 @@ NOTE: Please look at section 3 of padding-spec.txt now, not this document. circuits, and also what other classifiers can be built using deep learning and whatnot. +A. Acknowledgements + + This research was supported by NSF grants CNS-1526306 and CNS-1619454. + --- [0]: https://www.usenix.org/node/190967 diff --git a/proposals/305-establish-intro-dos-defense-extention.txt b/proposals/305-establish-intro-dos-defense-extention.txt index a0ddcef..e377f3e 100644 --- a/proposals/305-establish-intro-dos-defense-extention.txt +++ b/proposals/305-establish-intro-dos-defense-extention.txt @@ -191,6 +191,10 @@ Status: Closed or very popular which could mean time to increase or disable the denial of service defenses. +A. Acknowledgements + + This research was supported by NSF grants CNS-1526306 and CNS-1619454. + References: [1] https://lists.torproject.org/pipermail/tor-dev/2019-May/013837.html diff --git a/proposals/307-onionbalance-v3.txt b/proposals/307-onionbalance-v3.txt index 8716f13..6ff0ca4 100644 --- a/proposals/307-onionbalance-v3.txt +++ b/proposals/307-onionbalance-v3.txt @@ -178,3 +178,5 @@ A. Acknowledgments Thanks to the network team for helping me clarify my ideas here, explore options, and better understand some of the implementations and challenges in this problem space. + + This research was supported by NSF grants CNS-1526306 and CNS-1619454.

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 13 Dec '19

13 Dec '19

commit 3d2c27037652736aa3e4acbec7f1e429672f5d7d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 13 20:15:31 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index ab16dbfac5..8a3a59d50b 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -59,7 +59,7 @@ msgstr "" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.title) msgid "Relay operations" -msgstr "" +msgstr "გადამცემების ამუშავება" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.subtitle) @@ -67,11 +67,13 @@ msgid "" "Relays are the backbone of the Tor network. Help make Tor stronger and " "faster by running a relay today." msgstr "" +"გადამცემები Tor-ქსელის ხერხემალს წარმოადგენს. დაგვეხმარეთ, ავასწრაფოთ და " +"გავაძლიეროთ Tor დღესვე, გადამცემის გაშვებით." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.cta) msgid "Grow the Tor network" -msgstr "" +msgstr "გააფართოვეთ Tor-ქსელი" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) @@ -126,7 +128,7 @@ msgstr "" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.title) msgid "Training" -msgstr "" +msgstr "გადამზადება" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.subtitle) @@ -134,12 +136,12 @@ msgstr "" #: (content/training/resources/contents+en.lrpage.subtitle) msgid "" "Do you teach your community about using Tor? These resources are for you." -msgstr "" +msgstr "ასწავლით Tor-ის შესახებ თქვენს ერთობას? ეს მასალები გამოგადგებათ." #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.cta) msgid "Check our resources" -msgstr "" +msgstr "გადახედეთ მასალებს" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) @@ -179,11 +181,13 @@ msgid "" "Onion services help you and your users defeat surveillance and censorship. " "Learn how you can deploy onion services." msgstr "" +"Onion-მომსახურებები გეხმარებათ კავშირში მომხმარებლებთან ზედამხედველების " +"გარეშე. იხილეთ, როგორ გამართოთ." #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.cta) msgid "Grow your .onion" -msgstr "" +msgstr "განავითარეთ თქვენი .onion" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.body) @@ -201,7 +205,7 @@ msgstr "" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.title) msgid "Localization" -msgstr "" +msgstr "სხვადასხვა ენებზე მორგება" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.subtitle) @@ -209,11 +213,13 @@ msgid "" "We want Tor to work for everyone in the world, which means our software must" " be translated into a lot of languages." msgstr "" +"ჩვენ გვსურს მოვემსახუროთ ყველას, მთელ მსოფლიოში, ეს კი თავისთავად ნიშნავს, " +"რომ ჩვენი პროგრამა უნდა იყოს ხელმისაწვდომი მრავალ ენაზე." #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.cta) msgid "Help us translate" -msgstr "" +msgstr "დაგვეხმარეთ თარგმნაში" #: https//community.torproject.org/localization/ #: (content/localization/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 13 Dec '19

13 Dec '19

commit 5be3e4a0734d95a5ecc1c2aa53cade95e07e3e68 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 13 18:45:27 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 88f8141902..ab16dbfac5 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1,7 +1,7 @@ # Translators: -# Georgianization, 2019 # erinm, 2019 # Emma Peel, 2019 +# Georgianization, 2019 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Georgianization, 2019\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,33 +19,42 @@ msgstr "" #: https//community.torproject.org/ (content/contents+en.lrpage.title) msgid "Join the Tor Community" -msgstr "" +msgstr "შემოუერთდით Tor-ის ერთობას" #: https//community.torproject.org/ (content/contents+en.lrpage.subtitle) msgid "Our community is made up of human rights defenders around the world." msgstr "" +"ჩვენი ერთობა შედგება ადამიანის უფლებათა დამცველებისგან მთელი მსოფლიოდან" #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "The Tor community is made up of all kinds of contributors." -msgstr "" +msgstr "Tor-ის ერთობა წარმოდგენილია ყველა სახის შემომწირველით." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" "Some people write documentation and bug reports, while others hold Tor " "events and conduct outreach." msgstr "" +"ზოგი დაკავებულია მასალების შედგენითა და ხარვეზების მოხსენებით, სხვები Tor-ის" +" ღონისძიებების ჩატარებითა და მის შესახებ ცნობების გავრცელებით." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" "Whether you have a lot of time to volunteer or a little, and whether you " "consider yourself technical or not, we want you to join our community, too." msgstr "" +"ბევრი დრო გაქვთ თუ ცოტა მოხალისეობისთვის, მიიჩნევთ თავს თუ არა მცოდნედ " +"ტექნიკურ საკითხებში, ნებისმიერ შემთხვევაში ძლიერ გვსურს შემოუერთდეთ ჩვენს " +"ერთობას." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" "Below you'll find some different ways to volunteer with the Tor community as" " well as resources to help you help Tor." msgstr "" +"ქვემოთ მოცემულია სხვადასხვა გზები მონაწილების მისაღებად Tor-ის ერთობის " +"საქმიანობაში, აგრეთვე სასარგებლო მასალები, რომლებიც დაგეხმარებათ, დაეხმაროთ " +"Tor-ს." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.title)

1 0

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

13 Dec '19

commit dcbe68616df3afb6fb3e3d4dd046d7c737f79ffd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 13 18:19:17 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nb.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nb.po b/nb.po index 789db2fdec..4d1721d046 100644 --- a/nb.po +++ b/nb.po @@ -14,6 +14,7 @@ # 81149148127a5edca7d06dcbfba79969, 2014 # Per Thorsheim, 2015 # pr0xity, 2014 +# Tim Sivertsen, 2019 # tyler moss <inactive+protonbeta(a)transifex.com>, 2015 # 9d7045af8ca83a89b1b4bf48a2c67786, 2018 msgid "" @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2019-11-29 02:19+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-12-13 18:01+0000\n" +"Last-Translator: Tim Sivertsen\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\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 13 Dec '19

13 Dec '19

commit 62ec96728d0b6b825e924886e32f8cfe61d64691 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 13 18:17:26 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nb.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/nb.po b/nb.po index 20723eee05..ba17ff8bd0 100644 --- a/nb.po +++ b/nb.po @@ -14,6 +14,7 @@ # 81149148127a5edca7d06dcbfba79969, 2014 # Per Thorsheim, 2015 # pr0xity, 2014 +# Tim Sivertsen, 2019 # tyler moss <inactive+protonbeta(a)transifex.com>, 2015 # 9d7045af8ca83a89b1b4bf48a2c67786, 2018 msgid "" @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2019-11-29 02:19+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-12-13 18:01+0000\n" +"Last-Translator: Tim Sivertsen\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -311,7 +312,7 @@ msgstr "" msgid "" "Please check your list of additional software or read the system log to " "understand the problem." -msgstr "" +msgstr "Vennligst sjekk listen over tilleggsprogramvare, eller les systemloggen for å forstå problemet." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 msgid "Show Log" @@ -384,7 +385,7 @@ msgstr "Du kan installere {packages} automatisk når du starter Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345 msgid "To do so, you need to run Tails from a USB stick." -msgstr "" +msgstr "For å gjøre det, må du kjøre Tails fra en USB-pinne." #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. @@ -398,7 +399,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 #, python-brace-format msgid "This will stop installing {packages} automatically." -msgstr "" +msgstr "Dette vil slutte å installere {pakker} automatisk." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154 @@ -407,7 +408,7 @@ msgstr "Fjern" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." -msgstr "" +msgstr "Installerer tilleggsprogramvaren din fra vedvarende lagring..." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." @@ -434,7 +435,7 @@ msgstr "Kontroller nettverkstilkoblingen, start Tails på nytt, eller les system #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" -msgstr "" +msgstr "Oppgraderingen av tilleggsprogramvaren din mislyktes" #: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37 msgid "Documentation" @@ -1059,7 +1060,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29 msgid "_Open" -msgstr "" +msgstr "_Åpne" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38 msgid "Lock this volume" @@ -1067,7 +1068,7 @@ msgstr "Lås dette volumet" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52 msgid "_Unlock" -msgstr "" +msgstr "_Lås opp" #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61 msgid "Detach this volume"

1 0

[tor/master] src/ext: Add __future__ imports for python 3 compatibility
by nickm＠torproject.org 13 Dec '19

13 Dec '19

commit 0bb879e821b7caafd9479708a528443fb481503c Author: teor <teor(a)torproject.org> Date: Thu Dec 12 15:59:47 2019 +1000 src/ext: Add __future__ imports for python 3 compatibility Closes ticket 32732. --- src/ext/ed25519/ref10/base.py | 5 +++++ src/ext/ed25519/ref10/base2.py | 5 +++++ src/ext/ed25519/ref10/d.py | 5 +++++ src/ext/ed25519/ref10/d2.py | 5 +++++ src/ext/ed25519/ref10/sqrtm1.py | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/src/ext/ed25519/ref10/base.py b/src/ext/ed25519/ref10/base.py index 84accc858..8bfaab056 100644 --- a/src/ext/ed25519/ref10/base.py +++ b/src/ext/ed25519/ref10/base.py @@ -1,3 +1,8 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + b = 256 q = 2**255 - 19 l = 2**252 + 27742317777372353535851937790883648493 diff --git a/src/ext/ed25519/ref10/base2.py b/src/ext/ed25519/ref10/base2.py index 5e4e8739d..5923e43a7 100644 --- a/src/ext/ed25519/ref10/base2.py +++ b/src/ext/ed25519/ref10/base2.py @@ -1,3 +1,8 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + b = 256 q = 2**255 - 19 l = 2**252 + 27742317777372353535851937790883648493 diff --git a/src/ext/ed25519/ref10/d.py b/src/ext/ed25519/ref10/d.py index 8995bb86a..3fbb17507 100644 --- a/src/ext/ed25519/ref10/d.py +++ b/src/ext/ed25519/ref10/d.py @@ -1,3 +1,8 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + q = 2**255 - 19 def expmod(b,e,m): diff --git a/src/ext/ed25519/ref10/d2.py b/src/ext/ed25519/ref10/d2.py index 79841758b..3e533730b 100644 --- a/src/ext/ed25519/ref10/d2.py +++ b/src/ext/ed25519/ref10/d2.py @@ -1,3 +1,8 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + q = 2**255 - 19 def expmod(b,e,m): diff --git a/src/ext/ed25519/ref10/sqrtm1.py b/src/ext/ed25519/ref10/sqrtm1.py index 9a47fbc12..a276d4e67 100644 --- a/src/ext/ed25519/ref10/sqrtm1.py +++ b/src/ext/ed25519/ref10/sqrtm1.py @@ -1,3 +1,8 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + q = 2**255 - 19 def expmod(b,e,m):

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1598'
by nickm＠torproject.org 13 Dec '19

13 Dec '19

commit a7b6c01468171096f9e4b6262771c85511e0e4e7 Merge: f9a243a9d 0bb879e82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 13 11:09:17 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1598' contrib/client-tools/tor-resolve.py | 5 +++++ scripts/codegen/fuzzing_include_am.py | 5 +++++ scripts/codegen/gen_server_ciphers.py | 5 +++++ scripts/codegen/get_mozilla_ciphers.py | 5 +++++ scripts/codegen/makedesc.py | 5 +++++ scripts/maint/add_c_file.py | 5 +++++ scripts/maint/annotate_ifdef_directives.py | 5 +++++ scripts/maint/checkIncludes.py | 5 +++++ scripts/maint/format_changelog.py | 4 ++++ scripts/maint/lintChanges.py | 5 ++++- scripts/maint/locatemissingdoxygen.py | 5 +++++ scripts/maint/practracker/includes.py | 4 +++- scripts/maint/practracker/metrics.py | 5 +++++ scripts/maint/practracker/practracker.py | 3 +++ scripts/maint/practracker/practracker_tests.py | 5 +++++ scripts/maint/practracker/problem.py | 3 +++ scripts/maint/practracker/util.py | 5 +++++ scripts/maint/rectify_include_paths.py | 5 +++++ scripts/maint/redox.py | 11 ++++++++--- scripts/maint/rename_c_identifier.py | 5 +++++ scripts/maint/sortChanges.py | 4 ++++ scripts/maint/update_versions.py | 3 +++ scripts/test/appveyor-irc-notify.py | 4 +++- src/config/mmdb-convert.py | 5 +++++ src/ext/ed25519/ref10/base.py | 5 +++++ src/ext/ed25519/ref10/base2.py | 5 +++++ src/ext/ed25519/ref10/d.py | 5 +++++ src/ext/ed25519/ref10/d2.py | 5 +++++ src/ext/ed25519/ref10/sqrtm1.py | 5 +++++ src/test/bt_test.py | 4 ++++ src/test/ed25519_exts_ref.py | 5 +++++ src/test/hs_build_address.py | 5 +++++ src/test/hs_indexes.py | 5 +++++ src/test/hs_ntor_ref.py | 5 +++++ src/test/ntor_ref.py | 5 +++++ src/test/ope_ref.py | 5 +++++ src/test/slow_ed25519.py | 5 +++++ src/test/slownacl_curve25519.py | 7 ++++++- src/test/sr_commit_calc_ref.py | 5 +++++ src/test/sr_srv_calc_ref.py | 5 +++++ src/test/test_rebind.py | 3 +++ 41 files changed, 193 insertions(+), 7 deletions(-)

1 0

[tor/master] python: Add __future__ imports for python 3 compatibility
by nickm＠torproject.org 13 Dec '19

13 Dec '19

commit 1619f14a0420b0a57d65b9adeab8e8a4ef222b3a Author: teor <teor(a)torproject.org> Date: Thu Dec 12 15:58:51 2019 +1000 python: Add __future__ imports for python 3 compatibility Except for src/ext, which we may not want to modify. Closes ticket 32732. --- contrib/client-tools/tor-resolve.py | 5 +++++ scripts/codegen/fuzzing_include_am.py | 5 +++++ scripts/codegen/gen_server_ciphers.py | 5 +++++ scripts/codegen/get_mozilla_ciphers.py | 5 +++++ scripts/codegen/makedesc.py | 5 +++++ scripts/maint/add_c_file.py | 5 +++++ scripts/maint/annotate_ifdef_directives.py | 5 +++++ scripts/maint/checkIncludes.py | 5 +++++ scripts/maint/format_changelog.py | 4 ++++ scripts/maint/lintChanges.py | 5 ++++- scripts/maint/locatemissingdoxygen.py | 5 +++++ scripts/maint/practracker/includes.py | 4 +++- scripts/maint/practracker/metrics.py | 5 +++++ scripts/maint/practracker/practracker.py | 3 +++ scripts/maint/practracker/practracker_tests.py | 5 +++++ scripts/maint/practracker/problem.py | 3 +++ scripts/maint/practracker/util.py | 5 +++++ scripts/maint/rectify_include_paths.py | 5 +++++ scripts/maint/redox.py | 11 ++++++++--- scripts/maint/rename_c_identifier.py | 5 +++++ scripts/maint/sortChanges.py | 4 ++++ scripts/maint/update_versions.py | 3 +++ scripts/test/appveyor-irc-notify.py | 4 +++- src/config/mmdb-convert.py | 5 +++++ src/test/bt_test.py | 4 ++++ src/test/ed25519_exts_ref.py | 5 +++++ src/test/hs_build_address.py | 5 +++++ src/test/hs_indexes.py | 5 +++++ src/test/hs_ntor_ref.py | 5 +++++ src/test/ntor_ref.py | 5 +++++ src/test/ope_ref.py | 5 +++++ src/test/slow_ed25519.py | 5 +++++ src/test/slownacl_curve25519.py | 7 ++++++- src/test/sr_commit_calc_ref.py | 5 +++++ src/test/sr_srv_calc_ref.py | 5 +++++ src/test/test_rebind.py | 3 +++ 36 files changed, 168 insertions(+), 7 deletions(-) diff --git a/contrib/client-tools/tor-resolve.py b/contrib/client-tools/tor-resolve.py index 47ae1a0c3..593efc97d 100755 --- a/contrib/client-tools/tor-resolve.py +++ b/contrib/client-tools/tor-resolve.py @@ -1,5 +1,10 @@ #!/usr/bin/python +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import socket import struct import sys diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index a94458445..aa3ba49a7 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -1,5 +1,10 @@ #!/usr/bin/python +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + FUZZERS = """ consensus descriptor diff --git a/scripts/codegen/gen_server_ciphers.py b/scripts/codegen/gen_server_ciphers.py index 5d326f8b9..dd295b7f7 100755 --- a/scripts/codegen/gen_server_ciphers.py +++ b/scripts/codegen/gen_server_ciphers.py @@ -8,6 +8,11 @@ # # Run it on all the files in your openssl include directory. +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import re import sys diff --git a/scripts/codegen/get_mozilla_ciphers.py b/scripts/codegen/get_mozilla_ciphers.py index f23f2f1e6..d149c71c2 100755 --- a/scripts/codegen/get_mozilla_ciphers.py +++ b/scripts/codegen/get_mozilla_ciphers.py @@ -10,6 +10,11 @@ # It takes two arguments: the location of a firefox source directory, and the # location of an openssl source directory. +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import os import re import sys diff --git a/scripts/codegen/makedesc.py b/scripts/codegen/makedesc.py index efca4dda9..7d8177f46 100644 --- a/scripts/codegen/makedesc.py +++ b/scripts/codegen/makedesc.py @@ -9,6 +9,11 @@ # I've used this to make inputs for unit tests. I wouldn't suggest # using it for anything else. +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import base64 import binascii import ctypes diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py index a773fd0ff..a9a6eb25b 100755 --- a/scripts/maint/add_c_file.py +++ b/scripts/maint/add_c_file.py @@ -9,6 +9,11 @@ % add_c_file.py ./src/feature/dirauth/ocelot.c """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import os import re import time diff --git a/scripts/maint/annotate_ifdef_directives.py b/scripts/maint/annotate_ifdef_directives.py index 102128bfa..cd70b55c8 100755 --- a/scripts/maint/annotate_ifdef_directives.py +++ b/scripts/maint/annotate_ifdef_directives.py @@ -57,6 +57,11 @@ Note that only #else and #endif lines are annotated. Existing comments on those lines are removed. """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import re # Any block with fewer than this many lines does not need annotations. diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index 926b201b3..2ca46347f 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -5,6 +5,11 @@ # functionality. This is a stub file that exists so that older git # hooks will know where to look. +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import sys, os dirname = os.path.split(sys.argv[0])[0] diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index 97a6ce938..5f04a44ef 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -9,7 +9,11 @@ # To run it, pipe a section of the changelog (starting with "Changes # in Tor 0.x.y.z-alpha" through the script.) +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals + import os import re import sys diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py index 82c118f07..88a865a57 100755 --- a/scripts/maint/lintChanges.py +++ b/scripts/maint/lintChanges.py @@ -1,7 +1,10 @@ #!/usr/bin/python +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function -from __future__ import with_statement +from __future__ import unicode_literals + import sys import re import os diff --git a/scripts/maint/locatemissingdoxygen.py b/scripts/maint/locatemissingdoxygen.py index 797bf8176..9e58bd347 100755 --- a/scripts/maint/locatemissingdoxygen.py +++ b/scripts/maint/locatemissingdoxygen.py @@ -7,6 +7,11 @@ to highlight the undocumented stuff. """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import os import re import shutil diff --git a/scripts/maint/practracker/includes.py b/scripts/maint/practracker/includes.py index ed0e11ef2..fe0f32e25 100755 --- a/scripts/maint/practracker/includes.py +++ b/scripts/maint/practracker/includes.py @@ -19,8 +19,10 @@ Advisory .may_include files only result in warnings, rather than errors. """ - +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals import fnmatch import os diff --git a/scripts/maint/practracker/metrics.py b/scripts/maint/practracker/metrics.py index 4c62bc242..ae88b84f3 100644 --- a/scripts/maint/practracker/metrics.py +++ b/scripts/maint/practracker/metrics.py @@ -4,6 +4,11 @@ # These are currently ad-hoc string operations and regexps. # We might want to use a proper static analysis library in the future, if we want to get more advanced metrics. +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import re def get_file_len(f): diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 5f26d28ce..e1845c43e 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -19,7 +19,10 @@ problems in the Tor source, use the --regen flag: $ python3 --regen ./scripts/maint/practracker/practracker.py . """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals import os, sys diff --git a/scripts/maint/practracker/practracker_tests.py b/scripts/maint/practracker/practracker_tests.py index 45719d6cb..8d0418880 100755 --- a/scripts/maint/practracker/practracker_tests.py +++ b/scripts/maint/practracker/practracker_tests.py @@ -2,6 +2,11 @@ """Some simple tests for practracker metrics""" +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import unittest try: diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py index d21840a21..bee5eeb90 100644 --- a/scripts/maint/practracker/problem.py +++ b/scripts/maint/practracker/problem.py @@ -7,7 +7,10 @@ problem is worse than a registered exception so that it only warns when things get worse. """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals import os.path import re diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py index db02a983f..c52ca2fbb 100644 --- a/scripts/maint/practracker/util.py +++ b/scripts/maint/practracker/util.py @@ -1,3 +1,8 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import os # We don't want to run metrics for unittests, automatically-generated C files, diff --git a/scripts/maint/rectify_include_paths.py b/scripts/maint/rectify_include_paths.py index 1140e8cd2..111cf816c 100755 --- a/scripts/maint/rectify_include_paths.py +++ b/scripts/maint/rectify_include_paths.py @@ -1,5 +1,10 @@ #!/usr/bin/python +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import os import os.path import re diff --git a/scripts/maint/redox.py b/scripts/maint/redox.py index 203cce010..171c6d969 100755 --- a/scripts/maint/redox.py +++ b/scripts/maint/redox.py @@ -29,6 +29,14 @@ # "mv fname.c.newdoc fname.c". Otherwise, you'll need to merge # the parts you like by hand. +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +import re +import sys + # Which files should we ignore warning from? Mostly, these are external # files that we've snarfed in from somebody else, whose C we do no intend # to document for them. @@ -52,9 +60,6 @@ ADD_DOCDOCS_TO_TYPES += [ 'variable', ] # ==================== # The rest of this should not need hacking. -import re -import sys - KINDS = [ "type", "field", "typedef", "define", "function", "variable", "enumeration" ] diff --git a/scripts/maint/rename_c_identifier.py b/scripts/maint/rename_c_identifier.py index 213172d91..6e0c1d8cf 100755 --- a/scripts/maint/rename_c_identifier.py +++ b/scripts/maint/rename_c_identifier.py @@ -11,6 +11,11 @@ Helpful script to replace one or more C identifiers, and optionally generate a commit message explaining what happened. """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import argparse import fileinput import os diff --git a/scripts/maint/sortChanges.py b/scripts/maint/sortChanges.py index 44dd0dc41..2e049b1e5 100755 --- a/scripts/maint/sortChanges.py +++ b/scripts/maint/sortChanges.py @@ -7,7 +7,11 @@ changelog. """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals + import re import sys diff --git a/scripts/maint/update_versions.py b/scripts/maint/update_versions.py index 706a93b6a..07de1c343 100755 --- a/scripts/maint/update_versions.py +++ b/scripts/maint/update_versions.py @@ -1,6 +1,9 @@ #!/usr/bin/env python +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals import io import os diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index cfe0afe7a..598a68f47 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -75,8 +75,10 @@ in Appveyor's YAML: - "python scripts/test/appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function -from __future__ import absolute_import +from __future__ import unicode_literals import os import random diff --git a/src/config/mmdb-convert.py b/src/config/mmdb-convert.py index b861e9433..a58f5d43e 100644 --- a/src/config/mmdb-convert.py +++ b/src/config/mmdb-convert.py @@ -28,6 +28,11 @@ pieces. """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import struct import bisect import socket diff --git a/src/test/bt_test.py b/src/test/bt_test.py index f9ca79efd..d728f1359 100755 --- a/src/test/bt_test.py +++ b/src/test/bt_test.py @@ -15,7 +15,11 @@ OK """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals + import sys diff --git a/src/test/ed25519_exts_ref.py b/src/test/ed25519_exts_ref.py index 75562184b..658f7cde1 100644 --- a/src/test/ed25519_exts_ref.py +++ b/src/test/ed25519_exts_ref.py @@ -8,6 +8,11 @@ Includes self-tester and test vector generator. """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import slow_ed25519 from slow_ed25519 import * diff --git a/src/test/hs_build_address.py b/src/test/hs_build_address.py index 7ff22c3a9..91864eabc 100644 --- a/src/test/hs_build_address.py +++ b/src/test/hs_build_address.py @@ -1,3 +1,8 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import sys import hashlib import struct diff --git a/src/test/hs_indexes.py b/src/test/hs_indexes.py index af0b81f8d..5c6d893a6 100644 --- a/src/test/hs_indexes.py +++ b/src/test/hs_indexes.py @@ -7,6 +7,11 @@ # store/fetch the descriptor on the hashring. (hs_build_hs_index()). # +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import sys import hashlib import struct diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py index 1b9772a5d..f107cc36c 100644 --- a/src/test/hs_ntor_ref.py +++ b/src/test/hs_ntor_ref.py @@ -41,6 +41,11 @@ The whole logic and concept for this test suite was taken from ntor_ref.py. *** DO NOT USE THIS IN PRODUCTION. *** """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import struct import os, sys import binascii diff --git a/src/test/ntor_ref.py b/src/test/ntor_ref.py index 3e642eb25..e3307430e 100755 --- a/src/test/ntor_ref.py +++ b/src/test/ntor_ref.py @@ -27,6 +27,11 @@ commands: """ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import binascii try: import curve25519 diff --git a/src/test/ope_ref.py b/src/test/ope_ref.py index b2f701256..61a86b57b 100644 --- a/src/test/ope_ref.py +++ b/src/test/ope_ref.py @@ -4,6 +4,11 @@ # Reference implementation for our rudimentary OPE code, used to # generate test vectors. See crypto_ope.c for more details. +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.primitives.ciphers.algorithms import AES from cryptography.hazmat.backends import default_backend diff --git a/src/test/slow_ed25519.py b/src/test/slow_ed25519.py index f44708b20..afad67800 100644 --- a/src/test/slow_ed25519.py +++ b/src/test/slow_ed25519.py @@ -8,6 +8,11 @@ # # Don't edit this file. Mess with ed25519_ref.py +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import hashlib b = 256 diff --git a/src/test/slownacl_curve25519.py b/src/test/slownacl_curve25519.py index 4dabab61b..0cafe0e71 100644 --- a/src/test/slownacl_curve25519.py +++ b/src/test/slownacl_curve25519.py @@ -6,10 +6,15 @@ # Nick got the slownacl source from: # https://github.com/mdempsky/dnscurve/tree/master/slownacl -__all__ = ['smult_curve25519_base', 'smult_curve25519'] +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import sys +__all__ = ['smult_curve25519_base', 'smult_curve25519'] + P = 2 ** 255 - 19 A = 486662 diff --git a/src/test/sr_commit_calc_ref.py b/src/test/sr_commit_calc_ref.py index 45e629cfb..c4cb72d87 100644 --- a/src/test/sr_commit_calc_ref.py +++ b/src/test/sr_commit_calc_ref.py @@ -12,6 +12,11 @@ # COMMIT = base64-encode( TIMESTAMP || H(REVEAL) ) # +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import sys import hashlib import struct diff --git a/src/test/sr_srv_calc_ref.py b/src/test/sr_srv_calc_ref.py index 492ca62b1..a3752b15c 100644 --- a/src/test/sr_srv_calc_ref.py +++ b/src/test/sr_srv_calc_ref.py @@ -10,6 +10,11 @@ # HASHED_REVEALS | previous_SRV) # +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import sys import hashlib import struct diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index c9b9200b2..3fc3deb68 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -1,4 +1,7 @@ +# Future imports for Python 2.7, mandatory in 3.0 +from __future__ import division from __future__ import print_function +from __future__ import unicode_literals import errno import logging

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Dec '19

13 Dec '19

commit c7d360ae9116bbd0a5a7310614aa116eab0fcb11 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 13 13:55:24 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+it.po b/contents+it.po index d8fcc10f95..d6dae5f27a 100644 --- a/contents+it.po +++ b/contents+it.po @@ -13,9 +13,9 @@ # Giandomenico Lombardi <transifex.com(a)l1t.it>, 2019 # fabio carletti <fabiocarlettiryuw(a)gmail.com>, 2019 # Luke <94lukecatellani(a)gmail.com>, 2019 -# Davide Sant <spuuu(a)outlook.it>, 2019 # Francesca Davis <Aliak_93(a)yahoo.it>, 2019 # Emma Peel, 2019 +# Davide Sant <spuuu(a)outlook.it>, 2019 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Davide Sant <spuuu(a)outlook.it>, 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10356,7 +10356,7 @@ msgstr "Modifica questa pagina" #: templates/macros/question.html:19 msgid "Suggest Feedback" -msgstr "Esprimi un Feedback" +msgstr "Lascia un Feedback" #: templates/macros/question.html:20 msgid "Permalink"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 13 Dec '19

13 Dec '19

commit ace00423a9769ea5fe1421eca47b4539fc011fa2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 13 13:51:25 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ru.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 05057a38b4..0533f9b2ad 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -561,6 +561,8 @@ msgid "" "In most cases, choosing \"Connect\" will allow you to connect to the Tor " "network without any further configuration." msgstr "" +"В большинстве случаев, выбрав \"Соединиться\", вы подключитесь к сети Tor " +"без дополнительных настроек." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -579,7 +581,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### CONFIGURE" -msgstr "" +msgstr "### НАСТРОИТЬ" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -1734,7 +1736,7 @@ msgstr "Как Tor Browser работает с плагинами, расшир #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### FLASH PLAYER" -msgstr "" +msgstr "### FLASH PLAYER" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1766,7 +1768,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### JAVASCRIPT" -msgstr "" +msgstr "### JAVASCRIPT" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body)

1 0