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

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 3a2d24466dba4ef3f9ab71d0c3e1302203c6330e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 12:19:40 2019 +0000 Update translations for torbutton-torbuttondtd_completed --- nl/torbutton.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index 65f8ce7f0..1110aa74d 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -6,21 +6,21 @@ <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor-browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Beveiligingen"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie-bescherming…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik hier om Tor-knop te initialiseren"> <!ENTITY torbutton.prefs.security_settings "Tor-browser Beveiligingsinstellingen"> -<!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen"> -<!ENTITY torbutton.cookiedialog.lockCol "Beveiligd"> +<!ENTITY torbutton.cookiedialog.title "Beheer Cookie-bescherming"> +<!ENTITY torbutton.cookiedialog.lockCol "Beschermd"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> <!ENTITY torbutton.cookiedialog.nameCol "Naam"> <!ENTITY torbutton.cookiedialog.pathCol "Pad"> -<!ENTITY torbutton.cookiedialog.protectCookie "Cookie beveiligen"> +<!ENTITY torbutton.cookiedialog.protectCookie "Cookie beschermen"> <!ENTITY torbutton.cookiedialog.removeCookie "Cookie verwijderen"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Cookie beveiliging opheffen"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies, met uitzondering van de beveiligde, verwijderen"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe cookies niet"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Cooki-bescherming opheffen"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies, met uitzondering van de beschermde, verwijderen"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Bescherm nieuwe cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Bescherm nieuwe cookies niet"> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's."> <!ENTITY torbutton.prefs.sec_standard_label "Standaard">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 9c4982762ca319ea9e2b1b63acb1c04351193d00 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 12:19:32 2019 +0000 Update translations for torbutton-torbuttondtd --- nl/torbutton.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index 65f8ce7f0..1110aa74d 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -6,21 +6,21 @@ <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor-browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Beveiligingen"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie-bescherming…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik hier om Tor-knop te initialiseren"> <!ENTITY torbutton.prefs.security_settings "Tor-browser Beveiligingsinstellingen"> -<!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen"> -<!ENTITY torbutton.cookiedialog.lockCol "Beveiligd"> +<!ENTITY torbutton.cookiedialog.title "Beheer Cookie-bescherming"> +<!ENTITY torbutton.cookiedialog.lockCol "Beschermd"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> <!ENTITY torbutton.cookiedialog.nameCol "Naam"> <!ENTITY torbutton.cookiedialog.pathCol "Pad"> -<!ENTITY torbutton.cookiedialog.protectCookie "Cookie beveiligen"> +<!ENTITY torbutton.cookiedialog.protectCookie "Cookie beschermen"> <!ENTITY torbutton.cookiedialog.removeCookie "Cookie verwijderen"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Cookie beveiliging opheffen"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies, met uitzondering van de beveiligde, verwijderen"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe cookies niet"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Cooki-bescherming opheffen"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies, met uitzondering van de beschermde, verwijderen"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Bescherm nieuwe cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Bescherm nieuwe cookies niet"> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's."> <!ENTITY torbutton.prefs.sec_standard_label "Standaard">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 943cd893161859980f6f21e3c78f649d11a85b90 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 12:15:12 2019 +0000 Update translations for abouttor-homepage_completed --- ga-IE/aboutTor.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ga-IE/aboutTor.dtd b/ga-IE/aboutTor.dtd index 7f2f5d82c..79a3176e5 100644 --- a/ga-IE/aboutTor.dtd +++ b/ga-IE/aboutTor.dtd @@ -30,3 +30,6 @@ <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> <!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> <!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> + +<!ENTITY aboutTor.donationBanner3.line1 "Ba mhór an cúnamh dúinn síntiúis airgid míosúla."> +<!ENTITY aboutTor.donationBanner3.line2 "Bí i do Chosantóir an Phríobháideachais inniu.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 06 Aug '19

06 Aug '19

commit 745978c5b237a960ee0800e9ab39462fe9d8f89f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 12:15:05 2019 +0000 Update translations for abouttor-homepage --- ga-IE/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga-IE/aboutTor.dtd b/ga-IE/aboutTor.dtd index f649892dc..79a3176e5 100644 --- a/ga-IE/aboutTor.dtd +++ b/ga-IE/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> <!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> -<!ENTITY aboutTor.donationBanner3.line1 "Automatic monthly donations keep Tor strong."> -<!ENTITY aboutTor.donationBanner3.line2 "Become a Defender of Privacy today."> +<!ENTITY aboutTor.donationBanner3.line1 "Ba mhór an cúnamh dúinn síntiúis airgid míosúla."> +<!ENTITY aboutTor.donationBanner3.line2 "Bí i do Chosantóir an Phríobháideachais inniu.">

1 0

[tor/master] Distribute practracker unit and integration tests.
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit 30da1b61c66794fa3b321573ef7b871081cf8eff Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 1 13:59:26 2019 -0400 Distribute practracker unit and integration tests. --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am index 9d3fd97f6..4199ae83c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -171,7 +171,17 @@ EXTRA_DIST+= \ scripts/maint/practracker/exceptions.txt \ scripts/maint/practracker/metrics.py \ scripts/maint/practracker/practracker.py \ + scripts/maint/practracker/practracker_tests.py \ scripts/maint/practracker/problem.py \ + scripts/maint/practracker/testdata/a.c \ + scripts/maint/practracker/testdata/b.c \ + scripts/maint/practracker/testdata/ex0-expected.txt \ + scripts/maint/practracker/testdata/ex0.txt \ + scripts/maint/practracker/testdata/ex1-expected.txt \ + scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex.txt \ + scripts/maint/practracker/testdata/not_c_file \ + scripts/maint/practracker/test_practracker.sh \ scripts/maint/practracker/util.py ## This tells etags how to find mockable function definitions.

1 0

[tor/master] Port practracker unit tests to python 3
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit 5d98b54725efb15e904ea7abacdfe85da2a82bc5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 1 14:00:48 2019 -0400 Port practracker unit tests to python 3 --- scripts/maint/practracker/practracker_tests.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/maint/practracker/practracker_tests.py b/scripts/maint/practracker/practracker_tests.py index 865f68d18..45719d6cb 100755 --- a/scripts/maint/practracker/practracker_tests.py +++ b/scripts/maint/practracker/practracker_tests.py @@ -4,7 +4,12 @@ import unittest -import StringIO +try: + # python 2 names the module this way... + from StringIO import StringIO +except ImportError: + # python 3 names the module this way. + from io import StringIO import metrics @@ -38,7 +43,7 @@ fun,( class TestFunctionLength(unittest.TestCase): def test_function_length(self): - funcs = StringIO.StringIO(function_file) + funcs = StringIO(function_file) # All functions should have length 2 for name, lines in metrics.get_function_lines(funcs): self.assertEqual(name, "fun") @@ -50,7 +55,7 @@ class TestFunctionLength(unittest.TestCase): class TestIncludeCount(unittest.TestCase): def test_include_count(self): - f = StringIO.StringIO(""" + f = StringIO(""" # include <abc.h> # include "def.h" #include "ghi.h"

1 0

[tor/master] make dist: only include files from practracker dir intentionally.
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit 394528241947800a0ac881b8890e5af387e0e9d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 1 13:45:45 2019 -0400 make dist: only include files from practracker dir intentionally. Previously, we included temporary files and whatnot, which is not good. Fixes bug 31311; bugfix on 0.4.1.1-alpha. --- Makefile.am | 9 ++++++--- changes/ticket31311 | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3f3de34ce..10bd4b45c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -165,9 +165,12 @@ EXTRA_DIST+= \ README \ ReleaseNotes \ scripts/maint/checkIncludes.py \ - scripts/maint/checkSpace.pl \ - scripts/maint/practracker - + scripts/maint/checkSpace.pl \ + scripts/maint/practracker/exceptions.txt \ + scripts/maint/practracker/metrics.py \ + scripts/maint/practracker/practracker.py \ + scripts/maint/practracker/problem.py \ + scripts/maint/practracker/util.py ## This tells etags how to find mockable function definitions. AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*$[a-zA-Z0-9_]+$\W*,/\1/s' diff --git a/changes/ticket31311 b/changes/ticket31311 new file mode 100644 index 000000000..88dfb8573 --- /dev/null +++ b/changes/ticket31311 @@ -0,0 +1,3 @@ + o Minor bugfixes (distribution): + - Do not ship any temporary files found in the scripts/maint/practracker + directory. Fixes bug 31311; bugfix on 0.4.1.1-alpha.

1 0

[tor/master] Merge branch 'ticket31311_041' into ticket31304
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit 49c696fb4683c46be8e957900b6a95f95e422a4e Merge: e57209dc3 394528241 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 1 13:48:58 2019 -0400 Merge branch 'ticket31311_041' into ticket31304 Makefile.am | 9 ++++++--- changes/ticket31311 | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/master] practracker: Add unit tests to test script, and test script to makefile
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit fa60fee8d56af01f6fefca17f945bdd00d195571 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 1 14:01:43 2019 -0400 practracker: Add unit tests to test script, and test script to makefile This makes all of the practracker tests get run by make check, and hence by our CI. Closes ticket 31304. --- changes/ticket31304 | 3 +++ scripts/maint/practracker/test_practracker.sh | 4 ++++ src/test/include.am | 6 +++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/ticket31304 b/changes/ticket31304 new file mode 100644 index 000000000..ca60148b0 --- /dev/null +++ b/changes/ticket31304 @@ -0,0 +1,3 @@ + o Minor features (tests): + - The practracker tests are now run as part of the Tor test suite. + Closes ticket 31304. diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh index 590525660..c7be22770 100755 --- a/scripts/maint/practracker/test_practracker.sh +++ b/scripts/maint/practracker/test_practracker.sh @@ -29,6 +29,10 @@ run_practracker() { "${DATA}/" "$@"; } +echo "unit tests:" + +"${PYTHON:-python}" "${PRACTRACKER_DIR}/practracker_tests.py" || exit 1 + echo "ex0:" run_practracker --exceptions "${DATA}/ex0.txt" > "${TMPDIR}/ex0-received.txt" diff --git a/src/test/include.am b/src/test/include.am index 0ec4d96ad..7cd1ecae3 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -31,7 +31,11 @@ TESTSCRIPTS += \ endif if USEPYTHON -TESTSCRIPTS += src/test/test_ntor.sh src/test/test_hs_ntor.sh src/test/test_bt.sh +TESTSCRIPTS += \ + src/test/test_ntor.sh \ + src/test/test_hs_ntor.sh \ + src/test/test_bt.sh \ + scripts/maint/practracker/test_practracker.sh if COVERAGE_ENABLED # ...

1 0

[tor/master] Merge branch 'tor-github/pr/1195'
by asn＠torproject.org 06 Aug '19

06 Aug '19

commit d7afdb3b0fef4db30c9eb8cdad5890bfc241bb8d Merge: 4ee65a6f8 1440c2cb3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 6 14:51:47 2019 +0300 Merge branch 'tor-github/pr/1195' Makefile.am | 19 +++++++++++++++--- changes/ticket31304 | 3 +++ changes/ticket31311 | 3 +++ scripts/maint/practracker/practracker_tests.py | 11 ++++++++--- scripts/maint/practracker/test_practracker.sh | 27 ++++++++++++++++---------- src/test/include.am | 6 +++++- 6 files changed, 52 insertions(+), 17 deletions(-)

1 0