[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit bb2d1046160d183a96521bac21317aeb47f23c73 Author: Translation commit bot Date: Fri Sep 21 06:17:07 2018 + Update translations for tor_animation --- ka.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka.srt b/ka.srt index 036b1af61..26c21829b 100644 --- a/ka.srt +++ b/ka.srt @@ -17,7 +17,7 @@ places we go, and the stuff we read. 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +áááá áááááªáá, á£ááá áááá®á¡ááá 6 00:00:14,920 --> 00:00:17,740 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd
commit ecc66858eaf8e2ec05f1f47396b097b7cd69c948 Author: Translation commit bot Date: Fri Sep 21 06:16:51 2018 + Update translations for tba-android_stringsdtd --- gl/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gl/android_strings.dtd b/gl/android_strings.dtd index 0fa624ea2..09a03946d 100644 --- a/gl/android_strings.dtd +++ b/gl/android_strings.dtd @@ -315,7 +315,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
commit c49bb17d6deb8a7724a29a84d9752c27ecb291ff Author: Translation commit bot Date: Fri Sep 21 06:48:05 2018 + Update translations for torbutton-aboutdialogdtd --- he/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/aboutdialog.dtd b/he/aboutdialog.dtd index a343303f8..7a4723905 100644 --- a/he/aboutdialog.dtd +++ b/he/aboutdialog.dtd @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 8c24cd992a30366fcd17ea990dcaed759690 Author: Translation commit bot Date: Fri Sep 21 06:47:08 2018 + Update translations for tor_animation --- ka.srt | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ka.srt b/ka.srt index 26c21829b..227e0acf3 100644 --- a/ka.srt +++ b/ka.srt @@ -4,50 +4,50 @@ We've gotten very used to the Internet. 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +á©ááá áááá£áááááá áááááá ááá á©áááá¡ áááááªááááá¡ +á¡ááá£ááá áááá¡á áá ááá áá áªá®ááá ááááá: 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +á áá¡ ááááá, ááá¡ áá®áááááá, 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +á¡áá áááááááá á áá á áá¡ ááááá®á£áááá. 5 00:00:13,280 --> 00:00:14,640 -áááá áááááªáá, á£ááá áááá®á¡ááá +áááá áááááªáá, á£ááá áááá®á¡ááá. 6 00:00:14,920 --> 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +áá£á¡á¢áá áá®áá +áᣠááááá á¨áááªáááá áááááá®áá, 7 00:00:18,060 --> 00:00:22,480 -they'll see your real identity, -precise location, operating system, +ááá ááááááá¡ áá¥áááá¡ ááááááá áááááááá¡ +áá£á¡á¢ áááááá ááááá¡, á¡ááááá ááªáá á¡áá¡á¢áááá¡, 8 00:00:22,800 --> 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +á§áááá áááá¡ááá¢á¡, á ááááá᪠áááááá®á£ááá, +áá áá£ááá á¡, á ááááá¡á᪠áá§ááááá ááá¢áá ááá¢áá¡áááá¡, 9 00:00:26,700 --> 00:00:29,140 -and so much more information -about you and your life +áá ááááá á£ááá áá á¡á®áá ááá¤áá áááªááá¡ +áá¥áááá¡á áá áá¥áááá áªá®ááá áááá¡ á¨áá¡áá®áá 10 00:00:29,200 --> 00:00:31,500 -which you probably didn't mean -to share with unknown strangers, +á áá¡á áááááá áááá¡ á¡á£á áááááª, +á¡áááá áá£ááá áá ááá¥ááááááá á£áªááááááá¡áááá¡, 11 00:00:31,700 --> 00:00:34,000 -who could easily use this data -to exploit you. +á áááááá᪠ááá á¢áááá á¨áá£á«áááá áá áááááªáááááá¡ +áá¥áááá¡ á¡áá¬ááááá¦áááááá ááááá§ááááá. 12 00:00:34,500 --> 00:00:37,000 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
commit f7191fd290a3b85cd7bcf6f4c6cde938fafb591b Author: Translation commit bot Date: Fri Sep 21 07:18:16 2018 + Update translations for torbutton-browseronboardingproperties_completed --- he/browserOnboarding.properties | 54 + 1 file changed, 54 insertions(+) diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties new file mode 100644 index 0..e141ad125 --- /dev/null +++ b/he/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=×ר×× ××× +onboarding.tour-tor-welcome.title=××ª× ××××. +onboarding.tour-tor-welcome.description=×פ××¤× Tor ×צ××¢ ×ת ××ª×§× ××××× ×××תר ×©× ×¤×¨×××ת ×××××× ×××× ××××©× ×רשת. ××ª× ×××× ×עת ××¤× × ×עק×, צ×ת×ת ××¦× ××ר×. ××××ר ×××ר ×× ×ר×× ×× ×××. +onboarding.tour-tor-welcome.button=×ת×× ×¢×ש×× + +onboarding.tour-tor-privacy=פר×××ת +onboarding.tour-tor-privacy.title=×××× ×שש×× ××××× ××. +onboarding.tour-tor-privacy.description=×פ××¤× Tor ××××× ×¢××××ת ××××ק ×ת ××ס××ר×ת ××פ××¤× ×©×× ×××ר ×ש×× ×©××. ש×× ×××× ××× ××××××× ×©×פר×××ת ××××××× ×©×× ×××× ×× ××פ×פ×. ×××¥ âרשת Torâ ××× ××××× ×××¦× ×× ×× × ×××× ×× ×¢××× ×ר×ת ×רשת. +onboarding.tour-tor-privacy.button=×× ×× ×¨×©×ª Tor + +onboarding.tour-tor-network=רשת Tor +onboarding.tour-tor-network.title=×××× ×רשת ××××רת. +onboarding.tour-tor-network.description=×פ××¤× Tor ×××ר ×××ª× ×× ×¨×©×ª Tor ×××פע×ת ×¢"× ×××¤× ××ª× ×××× ×ר××× ××¢×××. ×ש×× × ××שר VPN, ××× × ×§××ת ××©× ××××ת ×× ×× ××¡× ××××רת ש××ª× ×¦×¨×× ×ס××× ×¢××× ×¢× ×× ×ª ×××× ×ת ××××× ××¨× × ××××¤× ×¤×¨××. +onboarding.tour-tor-network.button=×× ×× ×ª×¦××ת ××¢×× + +onboarding.tour-tor-circuit-display=תצ××ת ××¢×× +onboarding.tour-tor-circuit-display.title=ר×× ×ת ×× ×ª×× ×©××. +onboarding.tour-tor-circuit-display.description=×¢××ר ×× ×ª××× ×©××ª× ××קר ××, ×תע×××¨× ×©×× ×¢××רת ×××סר ××××¦×¤× ×ª ×××¢×× ××¨× ×©×××©× ×××¡×¨× Tor ×ר××× ××¢×××. ××× ×תר ש××××¢ ××××¤× ××ª× ×ת××ר. ××ª× ×××× ××קש ××¢×× ××ש ×¢"× ××××¦× ×¢× â××¢×× ××ש ×¢××ר ×תר ××â ×תצ××ת ×××¢×× ×©×× ×. +onboarding.tour-tor-circuit-display.button=ר×× ×ת ×× ×ª×× ×©×× + +onboarding.tour-tor-security=××××× +onboarding.tour-tor-security.title=××ר ×ת ××××ת×. +onboarding.tour-tor-security.description=×× ×× × ×ספק×× ×× ×× ×××ר×ת × ×ספ×ת ×¢××ר ×××רת ××××ת ××פ××¤× ×©××. ×××ר×ת ×××××× ×©×× × ×ת×ר×ת ×× ××ס×× ×ס×××ת שע××××× ×ש×ש ××× ×תק××£ ×ת ××××©× ×©××. ×××¥ ×××× ××× ×ר××ת ×× ××פשר×××ת ×ש×× ×ת ×¢×ש×ת. +onboarding.tour-tor-security.button=סק×ר ×××ר×ת + +onboarding.tour-tor-expect-differences=עצ×ת ××××× +onboarding.tour-tor-expect-differences.title=×¦×¤× ××ספר ××××××. +onboarding.tour-tor-expect-differences.description=×¢× ×× ×××פ××× ×× ×©× ×××××× ××פר×××ת ××ס×פק×× ×¢"× Tor, ×××××ª× ×עת ××××©× ×××× ××¨× × ×¢×©××× ××××ת ××¢× ×©×× ×. ××ר×× ×¢×©×××× ××××ת ××¢× ×××××× ××תר, ×××סת×××ת ×¢× ×¨×ת ×××××× ×©××, ×ס×××ת ×ס××××× ×¢×©×××× ×× ××¢××× ×× ×××××¢×. ××ת×× ×©×ª×ª×קש ×××××× ×©××ª× ×× ××©× ××× ×¨××××. +onboarding.tour-tor-expect-differences.button=ר×× ×©×××ת × ×¤×צ×ת + +onboarding.tour-tor-onion-services=ש×ר××ª× ××¦× +onboarding.tour-tor-onion-services.title=×××× ×קס××¨× ××××. +onboarding.tour-tor-onion-services.description=ש×ר××ª× ××¦× ×× ×תר×× ××סת××××× ×¢× .onion ××ספק ××× ×ת ×קס××¨× ×× ×פרס××× ×××קר××, ×××× ××צע×× ××× × ×©×ת×××¡×¤× × ×× ×¦× ××ר×. ש×ר××ª× ××¦× ×ת×ר×× ××× ××× ×ספק ת××× ×ש×ר×ת×× ××××¤× ××××× ×. ×××¥ ×××× ××× ××קר ××תר ×××¦× DuckDuckGo. +onboarding.tour-tor-onion-services.button=×קר ×××¦× + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=××× +onboarding.tor-circuit-display.done=××צע +onboarding.tor-circuit-display.one-of-three=1 ×ת×× 3 +onboarding.tor-circuit-display.two-of-three=2 ×ת×× 3 +onboarding.tor-circuit-display.three-of-three=3 ×ת×× 3 +
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 642fdba5045b2c8bd8ca356037a1cdb052cde561 Author: Translation commit bot Date: Fri Sep 21 06:15:39 2018 + Update translations for liveusb-creator --- ka/ka.po | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ka/ka.po b/ka/ka.po index 079613ed4..c6eec4d69 100644 --- a/ka/ka.po +++ b/ka/ka.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 09:36+0200\n" -"PO-Revision-Date: 2018-09-18 07:50+\n" +"PO-Revision-Date: 2018-09-21 06:14+\n" "Last-Translator: A. C. \n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -210,17 +210,17 @@ msgstr "ááá áááá«áááá syslinux' gptmbr.bin" #: ../tails_installer/creator.py:1299 #, python-format msgid "Reading extracted MBR from %s" -msgstr "" +msgstr "áááá¦ááá£áá MBR-áá¡ áááááªáááááá¡ á¬ááááá®áá %s-áááá" #: ../tails_installer/creator.py:1303 #, python-format msgid "Could not read the extracted MBR from %(path)s" -msgstr "" +msgstr "áááá¦ááá£áá MBR-áá¡ áááááªáááááá¡ á¬ááááá®áá ááá ááá®áá á®áá %(path)s-áááá" #: ../tails_installer/creator.py:1316 ../tails_installer/creator.py:1317 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "%s-áá¡ á©áá¢ááá áááá¡ áááááá á ááááá¡ áá¦ááááá" #: ../tails_installer/creator.py:1322 msgid "Drive is a loopback, skipping MBR reset" @@ -229,7 +229,7 @@ msgstr "" #: ../tails_installer/creator.py:1326 ../tails_installer/creator.py:1580 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "" +msgstr "ááááááá %s-áá¡ SHA1" #: ../tails_installer/creator.py:1351 msgid "Synchronizing data on disk..." @@ -262,13 +262,13 @@ msgstr "" #: ../tails_installer/creator.py:1528 msgid "Cannot find" -msgstr "" +msgstr "ááá áá«áááááá" #: ../tails_installer/creator.py:1529 msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "" +msgstr "áááááááá¬ááá, á áá á¡á á£ááá áááááá á¥áááá tails-installer-áá¡ zip-á¤áááá áá áá ááá áááá¡ ááá¨ááááááá." #: ../tails_installer/gui.py:69 #, python-format @@ -289,11 +289,11 @@ msgstr "" #: ../tails_installer/gui.py:260 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "ááá§ááááá ááá¡á á£áááá£ááá! (%s)" #: ../tails_installer/gui.py:265 msgid "Tails installation failed!" -msgstr "" +msgstr "Tails-áá¡ ááá§ááááá ááá ááá®áá á®áá!" #: ../tails_installer/gui.py:361 msgid "" @@ -304,7 +304,7 @@ msgstr "" #: ../tails_installer/gui.py:373 msgid "Tails Installer" -msgstr "" +msgstr "Tails-áá¡ áááá§ááááááá" #: ../tails_installer/gui.py:423 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" @@ -353,7 +353,7 @@ msgstr "" #: ../tails_installer/gui.py:545 msgid "No device suitable to install Tails could be found" -msgstr "" +msgstr "Tails-á¡ ááá¡áá§ááááááá áááá¡ááááá ááá¬á§ááááááá ááá áááá«áááá" #: ../tails_installer/gui.py:547 #, python-format @@ -373,7 +373,7 @@ msgstr "" msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "" +msgstr "ááá¬á§ááááááá â%(pretty_name)sâ ááá¢áá ááªáá á áááªá£ááááá¡áá Tails-áá¡ ááá¡áá§ááááááá (á¡áááá áá, á¡á£á ááªáá á %(size)s ááááá¢á)" #: ../tails_installer/gui.py:604 #, python-format @@ -384,7 +384,7 @@ msgstr "" #: ../tails_installer/gui.py:625 msgid "An error happened while installing Tails" -msgstr "" +msgstr "á¨ááªáááá á¬áá áááá¥ááá Tails-áá¡ ááá§áááááá¡áá¡" #: ../tails_installer/gui.py:637 msgid "Refreshing releases..." @@ -475,7 +475,7 @@ msgid "" "There was a problem executing `%s`.\n" "%s\n" "%s" -msgstr "" +msgstr "á®áá áááá ááá¨ááááá¡áá¡ â `%s`.\n%s\n%s" #: ../tails_installer/source.py:63 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 9c756d820d78532b1bbd3a913393c5446b197484 Author: Translation commit bot Date: Fri Sep 21 06:45:39 2018 + Update translations for https_everywhere_completed --- he/https-everywhere.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index 3eb2f0ad7..d237a12cf 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -18,6 +18,7 @@ + @@ -38,6 +39,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 4c56f741b2495dcd74858429d5b365aaf0a24bcd Author: Translation commit bot Date: Fri Sep 21 06:45:32 2018 + Update translations for https_everywhere --- he/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index cdd01ac53..d237a12cf 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -18,7 +18,7 @@ - + @@ -39,8 +39,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit 5a950226e1b2a62269f294723376875cfa4b86fb Author: Translation commit bot Date: Fri Sep 21 06:45:10 2018 + Update translations for abouttor-homepage_completed --- he/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index e47b43c7a..6d9880350 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -15,13 +15,13 @@ https://duckduckgo.com;> - + - + https://www.torproject.org/getinvolved/volunteer.html.en;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 5093feead5c3c5384e6db24a5767a552e922bdd3 Author: Translation commit bot Date: Fri Sep 21 06:45:03 2018 + Update translations for abouttor-homepage --- he/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index e47b43c7a..6d9880350 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -15,13 +15,13 @@ https://duckduckgo.com;> - + - + https://www.torproject.org/getinvolved/volunteer.html.en;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
commit a9245d8f392d7d1e2679074c40b03a5fdbe99b09 Author: Translation commit bot Date: Fri Sep 21 07:48:11 2018 + Update translations for torbutton-abouttbupdatedtd --- ka/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ka/abouttbupdate.dtd b/ka/abouttbupdate.dtd index 56ba4c020..51fd01e54 100644 --- a/ka/abouttbupdate.dtd +++ b/ka/abouttbupdate.dtd @@ -5,6 +5,6 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
commit 36be39c18c3075ee349a8464038bee62f59e2378 Author: Translation commit bot Date: Fri Sep 21 06:48:10 2018 + Update translations for torbutton-aboutdialogdtd_completed --- he/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/aboutdialog.dtd b/he/aboutdialog.dtd index a343303f8..7a4723905 100644 --- a/he/aboutdialog.dtd +++ b/he/aboutdialog.dtd @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit b93eb3b5ae57fc50c795873ca0945eb9bc4ee117 Author: Translation commit bot Date: Fri Sep 21 06:48:22 2018 + Update translations for torbutton-browseronboardingproperties --- he/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties index daa6b6e77..882f22205 100644 --- a/he/browserOnboarding.properties +++ b/he/browserOnboarding.properties @@ -24,7 +24,7 @@ onboarding.tour-tor-circuit-display.button=ר×× ×ת ×× ×ª×× ×©×× onboarding.tour-tor-security=××××× onboarding.tour-tor-security.title=××ר ×ת ××××ת×. -onboarding.tour-tor-security.description=×× ×× × ×ספק×× ×× ×× ×××ר×ת × ×ספ×ת ×¢××ר ×××רת ××××ת ××פ××¤× ×©××. ×××ר×ת ×××××× ×©×× × ×ת×ר×ת ×× ××ס×× ×ס×××ת שע××××ת ×ש×ש ××× ×תק××£ ×ת ××××©× ×©××. ×××¥ ×××× ××× ×ר××ת ×× ××פשר×××ת ×ש×× ×ת ×¢×ש×ת. +onboarding.tour-tor-security.description=×× ×× × ×ספק×× ×× ×× ×××ר×ת × ×ספ×ת ×¢××ר ×××רת ××××ת ××פ××¤× ×©××. ×××ר×ת ×××××× ×©×× × ×ת×ר×ת ×× ××ס×× ×ס×××ת שע××××× ×ש×ש ××× ×תק××£ ×ת ××××©× ×©××. ×××¥ ×××× ××× ×ר××ת ×× ××פשר×××ת ×ש×× ×ת ×¢×ש×ת. onboarding.tour-tor-security.button=סק×ר ×××ר×ת onboarding.tour-tor-expect-differences=עצ×ת ××××× ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
commit 9410ab476956d04f32db6bfbe37988b734960df7 Author: Translation commit bot Date: Fri Sep 21 07:47:34 2018 + Update translations for torbutton-brandproperties_completed --- ka/brand.properties | 16 1 file changed, 16 insertions(+) diff --git a/ka/brand.properties b/ka/brand.properties new file mode 100644 index 0..b825e9122 --- /dev/null +++ b/ka/brand.properties @@ -0,0 +1,16 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=Tor-áá áá£ááá á +brandShortName=Tor-áá áá£ááá á +brandFullName=Tor-áá áá£ááá á +vendorShortName=Tor-áá ááá¥á¢á + +homePageSingleStartMain=Firefox Start, á¡á¬á áá¤á á¡áá¬á§áá¡á áááá áá á©áá¨ááááá£áá á«ááááá¡ ááááá +homePageImport=ááááááá¢áááá áá¥áááá á¡áá¬á§áá¡á áááá áá %S-áááá + +homePageMigrationPageTitle=á¡áá¬á§áá¡á áááá ááá¡ áá á©ááá +homePageMigrationDescription=ááá®ááá ááá á©ááá á¡áá¡á£á áááá á¡áá¬á§áá¡á áááá áá: + +syncBrandShortName=Sync ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
commit 4bcb21c1cae5f14e4dc2b2177a4764b0efb7a121 Author: Translation commit bot Date: Fri Sep 21 07:47:29 2018 + Update translations for torbutton-brandproperties --- ka/brand.properties | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ka/brand.properties b/ka/brand.properties index 4f88b2172..b825e9122 100644 --- a/ka/brand.properties +++ b/ka/brand.properties @@ -5,12 +5,12 @@ brandShorterName=Tor-áá áá£ááá á brandShortName=Tor-áá áá£ááá á brandFullName=Tor-áá áá£ááá á -vendorShortName=Tor Project +vendorShortName=Tor-áá ááá¥á¢á -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, á¡á¬á áá¤á á¡áá¬á§áá¡á áááá áá á©áá¨ááááá£áá á«ááááá¡ ááááá +homePageImport=ááááááá¢áááá áá¥áááá á¡áá¬á§áá¡á áááá áá %S-áááá -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=á¡áá¬á§áá¡á áááá ááá¡ áá á©ááá +homePageMigrationDescription=ááá®ááá ááá á©ááá á¡áá¡á£á áááá á¡áá¬á§áá¡á áááá áá: syncBrandShortName=Sync ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd
commit 8eeebec35bdfb3f372bfdfe685a44c90d777f265 Author: Translation commit bot Date: Fri Sep 21 07:46:48 2018 + Update translations for tba-android_stringsdtd --- ka/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/android_strings.dtd b/ka/android_strings.dtd index 1a8144981..9f91b8e14 100644 --- a/ka/android_strings.dtd +++ b/ka/android_strings.dtd @@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site is run by " --> - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd] Update translations for torbutton-branddtd
commit d77639ebc9e51ac485954fccbb0e49af2963f838 Author: Translation commit bot Date: Fri Sep 21 07:47:39 2018 + Update translations for torbutton-branddtd --- ka/brand.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ka/brand.dtd b/ka/brand.dtd index 479c7af72..28e23451f 100644 --- a/ka/brand.dtd +++ b/ka/brand.dtd @@ -5,11 +5,11 @@ - - + + - - - - + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
commit 0fb7434656a6e99c0123e466217e79acc6ce43e6 Author: Translation commit bot Date: Fri Sep 21 07:47:44 2018 + Update translations for torbutton-branddtd_completed --- ka/brand.dtd | 15 +++ 1 file changed, 15 insertions(+) diff --git a/ka/brand.dtd b/ka/brand.dtd new file mode 100644 index 0..28e23451f --- /dev/null +++ b/ka/brand.dtd @@ -0,0 +1,15 @@ + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit 034d58ce88a782365b353af02bf9d7997a812e3b Author: Translation commit bot Date: Fri Sep 21 07:18:12 2018 + Update translations for torbutton-browseronboardingproperties --- he/browserOnboarding.properties | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties index 882f22205..e141ad125 100644 --- a/he/browserOnboarding.properties +++ b/he/browserOnboarding.properties @@ -19,7 +19,7 @@ onboarding.tour-tor-network.button=×× ×× ×ª×¦××ת ××¢×× onboarding.tour-tor-circuit-display=תצ××ת ××¢×× onboarding.tour-tor-circuit-display.title=ר×× ×ת ×× ×ª×× ×©××. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display. +onboarding.tour-tor-circuit-display.description=×¢××ר ×× ×ª××× ×©××ª× ××קר ××, ×תע×××¨× ×©×× ×¢××רת ×××סר ××××¦×¤× ×ª ×××¢×× ××¨× ×©×××©× ×××¡×¨× Tor ×ר××× ××¢×××. ××× ×תר ש××××¢ ××××¤× ××ª× ×ת××ר. ××ª× ×××× ××קש ××¢×× ××ש ×¢"× ××××¦× ×¢× â××¢×× ××ש ×¢××ר ×תר ××â ×תצ××ת ×××¢×× ×©×× ×. onboarding.tour-tor-circuit-display.button=ר×× ×ת ×× ×ª×× ×©×× onboarding.tour-tor-security=××××× @@ -29,12 +29,12 @@ onboarding.tour-tor-security.button=סק×ר ×××ר×ת onboarding.tour-tor-expect-differences=עצ×ת ××××× onboarding.tour-tor-expect-differences.title=×¦×¤× ××ספר ××××××. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +onboarding.tour-tor-expect-differences.description=×¢× ×× ×××פ××× ×× ×©× ×××××× ××פר×××ת ××ס×פק×× ×¢"× Tor, ×××××ª× ×עת ××××©× ×××× ××¨× × ×¢×©××× ××××ת ××¢× ×©×× ×. ××ר×× ×¢×©×××× ××××ת ××¢× ×××××× ××תר, ×××סת×××ת ×¢× ×¨×ת ×××××× ×©××, ×ס×××ת ×ס××××× ×¢×©×××× ×× ××¢××× ×× ×××××¢×. ××ת×× ×©×ª×ª×קש ×××××× ×©××ª× ×× ××©× ××× ×¨××××. onboarding.tour-tor-expect-differences.button=ר×× ×©×××ת × ×¤×צ×ת onboarding.tour-tor-onion-services=ש×ר××ª× ××¦× onboarding.tour-tor-onion-services.title=×××× ×קס××¨× ××××. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +onboarding.tour-tor-onion-services.description=ש×ר××ª× ××¦× ×× ×תר×× ××סת××××× ×¢× .onion ××ספק ××× ×ת ×קס××¨× ×× ×פרס××× ×××קר××, ×××× ××צע×× ××× × ×©×ת×××¡×¤× × ×× ×¦× ××ר×. ש×ר××ª× ××¦× ×ת×ר×× ××× ××× ×ספק ת××× ×ש×ר×ת×× ××××¤× ××××× ×. ×××¥ ×××× ××× ××קר ××תר ×××¦× DuckDuckGo. onboarding.tour-tor-onion-services.button=×קר ×××¦× # Circuit Display onboarding. @@ -45,7 +45,7 @@ onboarding.tor-circuit-display.two-of-three=2 ×ת×× 3 onboarding.tor-circuit-display.three-of-three=3 ×ת×× 3 onboarding.tor-circuit-display.intro.title=××× ××¢×××× ×¢×××××? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.msg=××¢×××× ×× ×××× ××סר×× ××קצ×× ×קר××ת, ש×× ××ש××× ×ר××× ××¢××× ×××××ר×× ×××¢××ר ×××× ×ª×¢××רת Tor. ××¢×××× ×ת×ר×× ×× ××××ש ×פר×××ת ×××ת××ר ×× ×©×ר××ª× ×צ×. onboarding.tor-circuit-display.diagram.title=תצ××ת ××¢×× onboarding.tor-circuit-display.diagram.msg=תרש×× ×× ×ר×× ×ת ×××סר×× ××ר××××× ×ת ×××¢×× ×¢××ר ×תר ××. ××× ××× ××¢ ק×ש×ר פע×××ת ×¢× ×¤× × ×תר×× ×©×× ××, ×× ×תר ×ק×× ××¢×× ×©×× ×. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual
commit 498640973e2834706c413584ae86c7be5ddc86a9 Author: Translation commit bot Date: Fri Sep 21 07:17:17 2018 + Update translations for tor-browser-manual --- he/he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/he.po b/he/he.po index 5f20c8a19..9ed19d343 100644 --- a/he/he.po +++ b/he/he.po @@ -1531,7 +1531,7 @@ msgstr "" #: transports.page:100 msgid "Snowflake" -msgstr "" +msgstr "פת×ת ש××" #: transports.page:105 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual
commit 4eac2fa799a94005e507191885930d711095b30a Author: Translation commit bot Date: Fri Sep 21 08:47:27 2018 + Update translations for tor-browser-manual --- ka/ka.po | 5 + 1 file changed, 5 insertions(+) diff --git a/ka/ka.po b/ka/ka.po index 397f47e43..14485525d 100644 --- a/ka/ka.po +++ b/ka/ka.po @@ -74,6 +74,11 @@ msgid "" " last relay in the circuit (the âexit relayâ) then sends the traffic out " "onto the public Internet." msgstr "" +"Tor á¬áá áááááááá¡ áááá áááááá¡ áá ááááá á¥á¡ááá¡, á ááááá᪠á¡áá¨á£áááááá¡ ááá«áááá ááá ááá " +"áááááªáááááá¡ áááªááá áá á£á¡áá¤á áá®áá áá¡áá áááááá ááá¢áá ááá¢áá. Tor áááááááá¡ " +"áááááªááááá¡ á¡ááá á¨áááá®ááááá áá á©áá£áá áááá¡áá®á£á á áááááá£á¢áá áá¡ (á.á¬. " +"ááááááªááá á¬áá á¢áááá¡) áááááá Tor-á¥á¡ááá¨á. á¬á áááá¡ áááá ááááááªááá áá " +"(ááᣠâáááá¡ááááá á¬áá á¢áááâ) áá áááááªááááá¡, á¨áááááá áááááááá¡ á¦áá ááá¢áá ááá¢á¨á." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 2eb28b38e9d9a6f3e5a189230a3f14a6c9265fc2 Author: Translation commit bot Date: Fri Sep 21 10:15:10 2018 + Update translations for bridgedb --- el/LC_MESSAGES/bridgedb.po | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index f5db0ff30..3f596687c 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -6,6 +6,7 @@ # Adrian Pappas , 2014 # Aikaterini Katmada, 2015 # andromeas , 2014 +# A Papac , 2018 # oahanx, 2014 # Ilias Giannaros , 2015 # isv31 <36b04...@anon.leemail.me>, 2014 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-09-17 15:37+\n" -"Last-Translator: Sofia K.\n" +"PO-Revision-Date: 2018-09-21 10:03+\n" +"Last-Translator: A Papac \n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Î£Ï Î³Î³Î½Ïμη! ÎάÏι Ïήγε ÏÏÏαβά με Ïο αίÏημα ÏαÏ." +msgstr "Î£Ï Î³Î³Î½Ïμη! ÎάÏι Ïήγε ÏÏÏαβά με Ïο αίÏημά ÏαÏ." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -72,7 +73,7 @@ msgstr "ÎμÏάνιÏη QRCode" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QRCode για ÏÎ¹Ï Î³ÎÏÏ ÏÎµÏ ÏαÏ" +msgstr "QRCode για ÏÎ¹Ï Î³ÎÏÏ ÏÎÏ ÏαÏ" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -95,7 +96,7 @@ msgstr "ÎÏ ÏÏ Ïο QRCode ÏεÏιÎÏει ÏÎ¹Ï Î³ÏαμμÎÏ Î³ÎÏÏ Ïα #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Îεν Ï ÏάÏÏÎ¿Ï Î½ καθÏÎ»Î¿Ï Î´Î¹Î±Î¸ÎÏÎ¹Î¼ÎµÏ Î³ÎÏÏ ÏεÏ..." +msgstr "Îεν Ï ÏάÏÏÎ¿Ï Î½ διαθÎÏÎ¹Î¼ÎµÏ Î³ÎÏÏ ÏεÏ..." #: bridgedb/https/templates/bridges.html:132 #, python-format @@ -112,7 +113,7 @@ msgstr "Îήμα %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "ÎαÏεβάÏÏε %s Tor Browser %s" +msgstr "ÎαÏεβάÏÏε Ïον %s Tor Browser %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -153,7 +154,7 @@ msgstr "ÎÏι" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "ÏίÏοÏα" +msgstr "κανÎνα" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -173,18 +174,18 @@ msgstr "%sÎ%sήÏη ÎεÏÏ ÏÏν" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[ÎÏ ÏÏ ÎµÎ¯Î½Î±Î¹ Îνα Î±Ï ÏομαÏοÏοιημενο Î¼Î®Î½Ï Î¼Î±, ÏαÏακαλοÏμε μην αÏανÏήÏεÏε]" +msgstr "[ÎÏ ÏÏ ÎµÎ¯Î½Î±Î¹ Îνα Î±Ï ÏομαÏοÏοιημενο Î¼Î®Î½Ï Î¼Î±. PαÏακαλοÏμε μην αÏανÏήÏεÏε!]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "ÎÎ´Ï ÎµÎ¯Î½Î±Î¹ οι γÎÏÏ ÏÎµÏ ÏαÏ:" +msgstr "ÎÏίÏÏε, οι γÎÏÏ ÏÎÏ ÏαÏ:" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "ÎεÏÎÏαÏÎµÏ Ïο ÏÏιο. ΠαÏακαλÏ, ÏÎ¹Ï Î±Ïγά! ΠελάÏιÏÏÎ¿Ï ÏÏÏÎ½Î¿Ï Î¼ÎµÏÎ±Î¾Ï Î´Î¹Î±Î´Î¿ÏικÏν email\n είναι %s ÏÏεÏ. Îλα Ïα ενδιάμεÏα email Ïε Î±Ï ÏÏ Ïο ÏÏÎ¿Î½Î¹ÎºÏ Î´Î¹Î¬ÏÏημα θα αγνοοÏνÏαι." +msgstr "ÎεÏεÏάÏαÏε Ïο ÏÏιο. ΠαÏακαλÏ, Ïιο αÏγά! ΠελάÏιÏÏÎ¿Ï ÏÏÏÎ½Î¿Ï Î¼ÎµÏÎ±Î¾Ï Î´Î¹Î±Î´Î¿ÏικÏν email\n είναι %s ÏÏεÏ. Îλα Ïα ενδιάμεÏα email Ïε Î±Ï ÏÏ Ïο ÏÏÎ¿Î½Î¹ÎºÏ Î´Î¹Î¬ÏÏημα θα αγνοοÏνÏαι." #: bridgedb/strings.py:50 msgid "" @@ -204,7 +205,7 @@ msgstr "Î¥ÏοÏÏηÏιζÏμενα transport TYPEs:" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Îειά ÏÎ¿Ï , %s!" +msgstr "Îειά ÏαÏ, %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" @@ -222,7 +223,7 @@ msgstr "ÎημÏÏια Îλειδιά" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "ÎÏ ÏÏ Ïο email ÏαÏήÏθη με αγάÏη, Î¿Ï Ïάνια ÏÏξα και ÏÏÏ ÏÏÏκονη\nγια Ïον/Ïην %s, %s ÏÏÎ¹Ï %s."
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit a901ff8292e10d0737f68a0298fa2071116c7027 Author: Translation commit bot Date: Fri Sep 21 10:15:30 2018 + Update translations for https_everywhere --- el/https-everywhere.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd index 4119915d7..d69400ebd 100644 --- a/el/https-everywhere.dtd +++ b/el/https-everywhere.dtd @@ -5,7 +5,7 @@ - + @@ -24,25 +24,25 @@ - + - + - + - + - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit c0bfdf6b7899ec34e5ae97c5473b7ff7e447ea1d Author: Translation commit bot Date: Fri Sep 21 10:15:37 2018 + Update translations for https_everywhere_completed --- el/https-everywhere.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd index 4119915d7..d69400ebd 100644 --- a/el/https-everywhere.dtd +++ b/el/https-everywhere.dtd @@ -5,7 +5,7 @@ - + @@ -24,25 +24,25 @@ - + - + - + - + - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 6b12ff82aa5c917c0fd881e816d858ff75668269 Author: Translation commit bot Date: Fri Sep 21 10:15:16 2018 + Update translations for bridgedb_completed --- el/LC_MESSAGES/bridgedb.po | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index f5db0ff30..3f596687c 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -6,6 +6,7 @@ # Adrian Pappas , 2014 # Aikaterini Katmada, 2015 # andromeas , 2014 +# A Papac , 2018 # oahanx, 2014 # Ilias Giannaros , 2015 # isv31 <36b04...@anon.leemail.me>, 2014 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-09-17 15:37+\n" -"Last-Translator: Sofia K.\n" +"PO-Revision-Date: 2018-09-21 10:03+\n" +"Last-Translator: A Papac \n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Î£Ï Î³Î³Î½Ïμη! ÎάÏι Ïήγε ÏÏÏαβά με Ïο αίÏημα ÏαÏ." +msgstr "Î£Ï Î³Î³Î½Ïμη! ÎάÏι Ïήγε ÏÏÏαβά με Ïο αίÏημά ÏαÏ." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -72,7 +73,7 @@ msgstr "ÎμÏάνιÏη QRCode" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QRCode για ÏÎ¹Ï Î³ÎÏÏ ÏÎµÏ ÏαÏ" +msgstr "QRCode για ÏÎ¹Ï Î³ÎÏÏ ÏÎÏ ÏαÏ" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -95,7 +96,7 @@ msgstr "ÎÏ ÏÏ Ïο QRCode ÏεÏιÎÏει ÏÎ¹Ï Î³ÏαμμÎÏ Î³ÎÏÏ Ïα #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Îεν Ï ÏάÏÏÎ¿Ï Î½ καθÏÎ»Î¿Ï Î´Î¹Î±Î¸ÎÏÎ¹Î¼ÎµÏ Î³ÎÏÏ ÏεÏ..." +msgstr "Îεν Ï ÏάÏÏÎ¿Ï Î½ διαθÎÏÎ¹Î¼ÎµÏ Î³ÎÏÏ ÏεÏ..." #: bridgedb/https/templates/bridges.html:132 #, python-format @@ -112,7 +113,7 @@ msgstr "Îήμα %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "ÎαÏεβάÏÏε %s Tor Browser %s" +msgstr "ÎαÏεβάÏÏε Ïον %s Tor Browser %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -153,7 +154,7 @@ msgstr "ÎÏι" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "ÏίÏοÏα" +msgstr "κανÎνα" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -173,18 +174,18 @@ msgstr "%sÎ%sήÏη ÎεÏÏ ÏÏν" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[ÎÏ ÏÏ ÎµÎ¯Î½Î±Î¹ Îνα Î±Ï ÏομαÏοÏοιημενο Î¼Î®Î½Ï Î¼Î±, ÏαÏακαλοÏμε μην αÏανÏήÏεÏε]" +msgstr "[ÎÏ ÏÏ ÎµÎ¯Î½Î±Î¹ Îνα Î±Ï ÏομαÏοÏοιημενο Î¼Î®Î½Ï Î¼Î±. PαÏακαλοÏμε μην αÏανÏήÏεÏε!]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "ÎÎ´Ï ÎµÎ¯Î½Î±Î¹ οι γÎÏÏ ÏÎµÏ ÏαÏ:" +msgstr "ÎÏίÏÏε, οι γÎÏÏ ÏÎÏ ÏαÏ:" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "ÎεÏÎÏαÏÎµÏ Ïο ÏÏιο. ΠαÏακαλÏ, ÏÎ¹Ï Î±Ïγά! ΠελάÏιÏÏÎ¿Ï ÏÏÏÎ½Î¿Ï Î¼ÎµÏÎ±Î¾Ï Î´Î¹Î±Î´Î¿ÏικÏν email\n είναι %s ÏÏεÏ. Îλα Ïα ενδιάμεÏα email Ïε Î±Ï ÏÏ Ïο ÏÏÎ¿Î½Î¹ÎºÏ Î´Î¹Î¬ÏÏημα θα αγνοοÏνÏαι." +msgstr "ÎεÏεÏάÏαÏε Ïο ÏÏιο. ΠαÏακαλÏ, Ïιο αÏγά! ΠελάÏιÏÏÎ¿Ï ÏÏÏÎ½Î¿Ï Î¼ÎµÏÎ±Î¾Ï Î´Î¹Î±Î´Î¿ÏικÏν email\n είναι %s ÏÏεÏ. Îλα Ïα ενδιάμεÏα email Ïε Î±Ï ÏÏ Ïο ÏÏÎ¿Î½Î¹ÎºÏ Î´Î¹Î¬ÏÏημα θα αγνοοÏνÏαι." #: bridgedb/strings.py:50 msgid "" @@ -204,7 +205,7 @@ msgstr "Î¥ÏοÏÏηÏιζÏμενα transport TYPEs:" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Îειά ÏÎ¿Ï , %s!" +msgstr "Îειά ÏαÏ, %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" @@ -222,7 +223,7 @@ msgstr "ÎημÏÏια Îλειδιά" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "ÎÏ ÏÏ Ïο email ÏαÏήÏθη με αγάÏη, Î¿Ï Ïάνια ÏÏξα και ÏÏÏ ÏÏÏκονη\nγια Ïον/Ïην %s, %s
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit a62fb18bff30a470b25c4036bcba7adc57d98b30 Author: Translation commit bot Date: Fri Sep 21 08:15:51 2018 + Update translations for tails-misc --- ka.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ka.po b/ka.po index 813d491e2..b8e6e4de6 100644 --- a/ka.po +++ b/ka.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 11:37+0200\n" -"PO-Revision-Date: 2018-09-04 14:30+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2018-09-21 08:01+\n" +"Last-Translator: A. C. \n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -468,7 +468,7 @@ msgstr "Tor" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torsta...@tails.boum.org/extension.js:55 msgid "Open Onion Circuits" -msgstr "" +msgstr "Onion-á¬á áááááá¡ ááá®á¡áá" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit e1d2ebd28cb3621b5813eb41871e9ee3e889f938 Author: Translation commit bot Date: Fri Sep 21 08:17:43 2018 + Update translations for torbutton-torbuttonproperties --- ka/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.properties b/ka/torbutton.properties index 352937165..95b9063fd 100644 --- a/ka/torbutton.properties +++ b/ka/torbutton.properties @@ -2,7 +2,7 @@ torbutton.circuit_display.internet = ááá¢áá ááá¢á torbutton.circuit_display.ip_unknown = á£áªáááá IP ááá¡áááá áá torbutton.circuit_display.onion_site = ááááááá¡ á¡ááá¢á torbutton.circuit_display.this_browser = áá¡ áá áá£ááá á -torbutton.circuit_display.relay = áá á®á +torbutton.circuit_display.relay = ááááááªááá torbutton.circuit_display.tor_bridge = á®ááá torbutton.circuit_display.unknown_country = á£áªáááá á¥ááá§ááá torbutton.circuit_display.guard = ááªáááá ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit a251529a3eada4ebcfcd5b204c2417f1808509a8 Author: Translation commit bot Date: Fri Sep 21 08:17:52 2018 + Update translations for torbutton-torbuttondtd --- ka/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd index 2dcd331b7..7d92a834c 100644 --- a/ka/torbutton.dtd +++ b/ka/torbutton.dtd @@ -1,6 +1,6 @@ - + @@ -47,5 +47,5 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits
commit df1edb2b5dbc964e4a1cd2694bad37e80bd58574 Author: Translation commit bot Date: Fri Sep 21 08:16:30 2018 + Update translations for tails-onioncircuits --- ka/onioncircuits.pot | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ka/onioncircuits.pot b/ka/onioncircuits.pot index 494d27853..1134873a5 100644 --- a/ka/onioncircuits.pot +++ b/ka/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+\n" -"PO-Revision-Date: 2018-09-18 07:51+\n" +"PO-Revision-Date: 2018-09-21 07:59+\n" "Last-Translator: A. C. \n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -24,11 +24,11 @@ msgstr "" #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "" +msgstr "Onion-áá¡ á¬á ááááá" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "á¬á ááá" #: ../onioncircuits:126 msgid "Status" @@ -36,7 +36,7 @@ msgstr "ááááááá áááá" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "ááá¬ááááá á¬á áááá, á¨áááááááááá Tor-ááááááªáááááá¡ á¨áá¡áá®áá áá áªááá á¡áááá®áááá." #: ../onioncircuits:221 msgid "The connection to Tor was lost..." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual
commit e0be211ea744622f27269a4c27c89979fa948879 Author: Translation commit bot Date: Fri Sep 21 08:17:20 2018 + Update translations for tor-browser-manual --- ka/ka.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/ka.po b/ka/ka.po index 190ca0c53..397f47e43 100644 --- a/ka/ka.po +++ b/ka/ka.po @@ -715,7 +715,7 @@ msgstr "" #: managing-identities.page:123 msgid "New Tor Circuit for this Site" -msgstr "" +msgstr "áá®ááá Tor-á¬á ááá áá á¡ááá¢áá¡áááá¡" #: managing-identities.page:124 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit faf8a9f28fe876529380fc311f059f3bc45752ec Author: Translation commit bot Date: Fri Sep 21 08:18:17 2018 + Update translations for torbutton-browseronboardingproperties --- ka/browserOnboarding.properties | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties index 1c0bddc55..fa86e11a9 100644 --- a/ka/browserOnboarding.properties +++ b/ka/browserOnboarding.properties @@ -17,7 +17,7 @@ onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display -onboarding.tour-tor-circuit-display=Circuit Display +onboarding.tour-tor-circuit-display=á¬á áááá¡ á¡áá©áááááááá áá á onboarding.tour-tor-circuit-display.title=See your path. onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking âNew Circuit for this Siteâ on our Circuit Display. onboarding.tour-tor-circuit-display.button=See My Path @@ -44,11 +44,11 @@ onboarding.tor-circuit-display.one-of-three=1 of 3 onboarding.tor-circuit-display.two-of-three=2 of 3 onboarding.tor-circuit-display.three-of-three=3 of 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=á áááá áá£á¨áááá¡ á¬á ááááá? +onboarding.tor-circuit-display.intro.msg=á¬á ááááá áá¥ááááá á¨áááá®ááááá á¨áá á©áá£áá ááááááªáááááá, á áááááá¡á᪠á¬áá áááááááá¡ áááá áá¡áá¤áááá¨á áááááá£áá áááááá£á¢áá ááá, ááááá áá£ááá á¡ááááááááá Tor-á¥á¡áááá¡ áááááªáááááá¡ ááá¡áá¢áá ááááá. á¬á ááááá á¡áá¨á£áááááá¡ ááá«áááá, áááááá®á£ááá áááá áááá ááá ááá áááááªáááááá¡ áááªááá áá á¬ááááá áááá¦áá Onion-áááá¡áá®á£á ááááááá. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=á¬á áááá¡ áá á +onboarding.tor-circuit-display.diagram.msg=á¡á¥ááááá áááªááá£ááá ááááááªááááá, á áááááá᪠á¥áááá¡ á¬á ááá¡ áá á¡ááá¢áá¡ ááá¡áááá®á£áááááá. á¡á®ááááá¡á®áá á¡ááá¢áááá ááá¥áááááááá¡ á¨áá áá¡ á£á áááá ááááá¨áá áá¡ áááááááá¡ áá¡áá ááááááá, áááááá£á á¡ááá¢áá á¬áááááá¡áááá¡ áááá¡á®áááááá£áá á¬á ááá áááááá§ááááá. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website youâre trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=áá®ááá á¬á ááá ááá¡áááá ááááá? +onboarding.tor-circuit-display.new-circuit.msg=áᣠááá áá®áá á®ááá áááááá¨áá áááá¡ á¡ááá¢ááá, á ááááá¡ ááá®áá᪠áá¡á£á á áá ááááá áá áá¡áááááááá á©ááá¢ááá áá, ááá¨áá á¨áááá«áááá áá á¦áááááá¡ ááááá§áááááá á®áááá®áá á©áá¢ááá ááá á¡ááá¢á áá®ááá á¬á áááá. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties
commit 4dfc47afee27b051a32f241bd64185a506a16d0f Author: Translation commit bot Date: Fri Sep 21 08:18:33 2018 + Update translations for tor-launcher-properties --- ka/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties index 2218a43e0..65da8a88b 100644 --- a/ka/torlauncher.properties +++ b/ka/torlauncher.properties @@ -60,7 +60,7 @@ torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information torlauncher.bootstrapStatus.conn_or=á£áááá¨áá áááá Tor-á¥á¡ááá¡ -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit +torlauncher.bootstrapStatus.handshake_or=Tor-áá¡ áááá¨áá áá¡ á¬á áááá¡ áááá§áá ááá torlauncher.bootstrapStatus.done=Connected to the Tor network! torlauncher.bootstrapWarning.done=done ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
commit 47db8cb77d14299a0ba34587c887e0ecd4d6eb9d Author: Translation commit bot Date: Fri Sep 21 08:18:07 2018 + Update translations for torbutton-abouttbupdatedtd --- ka/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/abouttbupdate.dtd b/ka/abouttbupdate.dtd index 51fd01e54..82e2e3b63 100644 --- a/ka/abouttbupdate.dtd +++ b/ka/abouttbupdate.dtd @@ -6,5 +6,5 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
commit 40dbd464057fafb80b1d55f8bb862ac13ec61930 Author: Translation commit bot Date: Fri Sep 21 08:18:12 2018 + Update translations for torbutton-abouttbupdatedtd_completed --- ka/abouttbupdate.dtd | 4 1 file changed, 4 insertions(+) diff --git a/ka/abouttbupdate.dtd b/ka/abouttbupdate.dtd index 0a080f392..82e2e3b63 100644 --- a/ka/abouttbupdate.dtd +++ b/ka/abouttbupdate.dtd @@ -4,3 +4,7 @@ + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-spec/master] Starting Tor Browser proposals
commit 6becf9c072a8111f1a8a68c5f1c2e4fbf359a722 Author: Georg Koppen Date: Fri Sep 21 10:29:36 2018 + Starting Tor Browser proposals --- audits/FF31_NETWORK_AUDIT| 2 +- proposals/001-process.txt| 119 ++ proposals/100-onion-location-header.txt | 124 ++ proposals/101-security-controls-redesign.txt | 234 +++ 4 files changed, 478 insertions(+), 1 deletion(-) diff --git a/audits/FF31_NETWORK_AUDIT b/audits/FF31_NETWORK_AUDIT index 163a4e6..c575dec 100644 --- a/audits/FF31_NETWORK_AUDIT +++ b/audits/FF31_NETWORK_AUDIT @@ -75,7 +75,7 @@ Direct paths to DNS resolution: + nsDNSService::AsyncResolve + Patched for safety + nsHostResolver::ResolveHost - + Only used by nsDNSService + + Only used by nsDNSService2 Misc UDP (SOCK_DGRAM, PR_DESC_SOCKET_UDP): + PR_DESC_SOCKET_UDP diff --git a/proposals/001-process.txt b/proposals/001-process.txt new file mode 100644 index 000..fa0fffc --- /dev/null +++ b/proposals/001-process.txt @@ -0,0 +1,119 @@ +Filename: 001-process.txt +Title: The Tor Browser Proposal Process +Author: Georg Koppen +Created: 21-Sep-2018 +Status: Meta + +Overview: + + This document describes how Tor Browser proposals work. It heavily borrowed + and copied from the Tor proposal process. + + This is an informational document. + +Motivation: + + Previously, our process for implementing complex features possibly including + the expertise of different teams consisted of discussions on IRC, our bug + tracker, and at informal sessions at our developer meetings. While this worked + more or less it's hard to keep track of the status of various ideas and it + makes it more difficult to reason about their pros and cons. Tor Browser + proposals should help address those issues and aid in deciding which ideas to + implement and how, and which not. + +How new proposals get added: + + Once an idea has been proposed on the tbb-dev (or if relevant: the tor-dev) + development list, a properly formatted (see below) draft exists, and rough + consensus within the active development community exists that this idea + warrants consideration, the proposal editors will officially add the proposal. + + To get your proposal in, send it to the tbb-dev mailing list. + + The current proposal editors are Georg Koppen. + +What should go in a proposal: + + Every proposal should have a header containing these fields: +Filename, Title, Author, Created, Status, Ticket. + + These fields are optional but recommended: +Target, Implemented-In. + + The Target field should describe which version the proposal is hoped to be + implemented in (if it's Open or Accepted). The Implemented-In field should + describe which version the proposal was implemented in (if it's Finished or + Closed). The Ticket field should be a ticket number referring to Tor's + canonical bug tracker (e.g. "#21952" refers to + https://bugs.torproject.org/21952) or to a publicly accessible URI where one + may subscribe to updates and/or retrieve information on implementation + status. + + The body of the proposal should start with an Overview section explaining + what the proposal's about, what it does, and about what state it's in. + + After the Overview, the proposal becomes more free-form. Depending on its + length and complexity, the proposal can break into sections as appropriate, + or follow a short discursive format. Every proposal should contain at least + the following information before it is "ACCEPTED", though the information + does not need to be in sections with these names. + +Motivation: What problem is the proposal trying to solve? Why does this + problem matter? If several approaches are possible, why take this one? + +Design: A high-level view of what the new or modified features are, how the + new or modified features work, how they interoperate with each other, and + how they interact with the rest of Tor Browser. This is the main body of + the proposal. + +Proposal status: + + Open: A proposal under discussion. + + Accepted: The proposal is complete, and we intend to implement it. After this +point, substantive changes to the proposal should be avoided, and regarded +as a sign of the process having failed somewhere. + + Finished: The proposal has been accepted and implemented. After this point, +the proposal should not be changed. + + Rejected: We're not going to implement the feature as described here, though +we might do some other version. See comments in the document for details. +The proposal should not be changed after this point; to bring up some other +version of the idea, write a new proposal. + + Draft: This isn't a complete proposal yet; there are definite missing pieces. +Please don't add any new proposals with this status; put them in the "ideas" +sub-directory instead. + + Needs-Revision: The idea for
[tor-commits] [translation/support-portal] Update translations for support-portal
commit 0c47439cabd6873399be965ceb88a7e9be19bb6e Author: Translation commit bot Date: Fri Sep 21 10:48:51 2018 + Update translations for support-portal --- contents+el.po | 6 ++ 1 file changed, 6 insertions(+) diff --git a/contents+el.po b/contents+el.po index 77729c26a..c73c85a7f 100644 --- a/contents+el.po +++ b/contents+el.po @@ -607,6 +607,8 @@ msgid "" "Once you have copied the log, you will be able to paste it into a text " "editor or email client." msgstr "" +"ÎÏÎ¿Ï Î±Î½ÏιγÏάÏεÏε Ïο αÏÏείο καÏαγÏαÏήÏ, θα μÏοÏείÏε να Ïο εÏικολλήÏεÏε Ïε " +"ÏÏÏγÏαμμα εÏεξεÏγαÏÎ¯Î±Ï ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï Î® Îναν email client." #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) @@ -894,6 +896,8 @@ msgid "" "There is currently no supported method for setting Tor Browser as your " "default browser." msgstr "" +"ÎÏ Ïήν Ïη ÏÏιγμή δεν Ï ÏάÏÏει Ï ÏοÏÏηÏιζÏμενη μÎÎ¸Î¿Î´Î¿Ï Î³Î¹Î± Ïη ÏÏθμιÏη ÏÎ¿Ï Tor " +"Browser ÏÏ ÏÏοεÏιλεγμÎÎ½Î¿Ï ÏεÏιηγηÏή." #: http//localhost/tbb/tbb-39/ #: (content/tbb/tbb-39/contents+en.lrquestion.description) @@ -956,6 +960,8 @@ msgstr "" #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) msgid "You can access these websites by using Tor Browser." msgstr "" +"ÎÏοÏείÏε να αÏοκÏήÏεÏε ÏÏÏÏβαÏη Ïε Î±Ï ÏÎÏ ÏÎ¹Ï Î¹ÏÏοÏÎµÎ»Î¯Î´ÎµÏ ÏÏηÏιμοÏοιÏνÏÎ±Ï Ïον" +" Tor Browser." #: http//localhost/tormobile/tormobile-1/ #: (content/tormobile/tormobile-1/contents+en.lrquestion.title) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] Update translations for support-portal
commit 8adef42a082c84d325beadf18c7cf239cdc24cd4 Author: Translation commit bot Date: Fri Sep 21 09:18:55 2018 + Update translations for support-portal --- contents+el.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+el.po b/contents+el.po index 4b303592f..77729c26a 100644 --- a/contents+el.po +++ b/contents+el.po @@ -520,6 +520,8 @@ msgstr "" msgid "" "* Make sure tor starts on boot by running \"sysrc tor_enable=YES\" (as root)" msgstr "" +"* ÎεβαιÏθείÏε ÏÏι ο tor ξεκινάει ÏÏο boot εκÏελÏνÏÎ±Ï Ïο \"sysrc tor_enable =" +" YES\" (ÏÏ root)" #: http//localhost/connecting/connecting-3/ #: (content/connecting/connecting-3/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit f8200a8bd686707d188977d5ec8448835bc66c54 Author: Translation commit bot Date: Fri Sep 21 10:45:28 2018 + Update translations for https_everywhere --- el/ssl-observatory.dtd | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/el/ssl-observatory.dtd b/el/ssl-observatory.dtd index 9492e4327..df645b0a8 100644 --- a/el/ssl-observatory.dtd +++ b/el/ssl-observatory.dtd @@ -1,6 +1,6 @@ - + --> "ÎÏαν βλÎÏÎµÎ¹Ï Îνα νÎο ÏιÏÏοÏοιηÏικÏ, ÏÎµÏ ÏÏο ΠαÏαÏηÏηÏήÏιο με Ïοιον ΠάÏοÏο Î¥ÏηÏεÏιÏν ÎιαδικÏÏÎ¿Ï ÎÏÎµÎ¹Ï ÏÏ Î½Î´ÎµÎ¸ÎµÎ¯."> +"Î ÏÏ Î³ÎºÎµÎºÏιμÎνη εÏιλογή θα ανακÏήÏει και θα αÏοÏÏείλει Ïον ÎÏ ÏÏνομο ÎÏÎ¹Î¸Î¼Ï Î£Ï ÏÏήμαÏÎ¿Ï (Autonomous System number) ÏÎ¿Ï Î´Î¹ÎºÏÏÎ¿Ï ÏαÏ. ÎÏ ÏÏ Î¸Î± Î¼Î±Ï Î²Î¿Î·Î¸Î®Ïει να ενÏοÏίÏÎ¿Ï Î¼Îµ εÏιθÎÏÎµÎ¹Ï ÎµÎ½Î±Î½Ïίον ÏÎ¿Ï HTTPS και να καθοÏίÏÎ¿Ï Î¼Îµ αν ÎÏÎ¿Ï Î½ ÏαÏαÏηÏηθεί εÏιθÎÏÎµÎ¹Ï Î±ÏÏ Î¼ÎÏη ÏÏÏÏ Î· Î£Ï Ïία και Ïο ÎÏάν ÏÏÎ¿Ï Î±Ï ÏÎÏ Î¿Î¹ εÏιθÎÏÎµÎ¹Ï ÎµÎ¯Î½Î±Î¹ ÏÏ Î³ÎºÏιÏικά Ïιο ÏÏ Î½Î·Î¸Î¹ÏμÎνεÏ."> +"ÎμÏάνιÏη ÏÏοειδοÏοίηÏÎ·Ï ÏÏαν Ïο ΠαÏαÏηÏηÏήÏιο ενÏοÏίζει Îνα ÏιÏÏοÏοιηÏÎ¹ÎºÏ ÏÎ¿Ï ÎÏει ανακληθεί, ÏÎ¿Ï Î´ÎµÎ½ Ïο ÎÏει ενÏοÏίÏει ο ÏεÏιηγηÏÎ®Ï ÏαÏ."> @@ -54,8 +54,8 @@ to turn it on?">--> +ÏÏÎλνει ανÏίγÏαÏα ÏÏν ÏιÏÏοÏοιηÏικÏν HTTPS ÏÏο ΠαÏαÏηÏηÏήÏιο, για να Î¼Î±Ï Î²Î¿Î·Î¸Î®Ïει να ανιÏνεÏÏÎ¿Ï Î¼Îµ εÏιθÎÏÎµÎ¹Ï 'ενδιάμεÏÎ¿Ï ÏαÏαÏηÏηÏή' και να βελÏιÏÏει Ïην αÏÏάλεια ÏÎ¿Ï Î Î±Î³ÎºÏÏÎ¼Î¹Î¿Ï ÎÏÏÎ¿Ï ÎºÎ±Î¹ (2) +Î¼Î±Ï ÎµÏιÏÏÎÏει να ÏÎ±Ï ÏÏοειδοÏοιοÏμε ÏÏεÏικά με μη-αÏÏÎ±Î»ÎµÎ¯Ï ÏÏ Î½Î´ÎÏÎµÎ¹Ï Î® εÏιθÎÏÎµÎ¹Ï ÏÏον ÏεÏιηγηÏή ÏαÏ."> https://www.example.com, Ïο ÏιÏÏοÏοιηÏÎ¹ÎºÏ -ÏÎ¿Ï Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Ïο ΠαÏαÏηÏηÏήÏιο θα δείξει ÏÏι κάÏÎ¿Î¹Î¿Ï ÎºÎ¬ÏÎ¿Î¹Î¿Ï ÎµÏιÏκÎÏθηκε +ÏÎ¿Ï Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Ïο ΠαÏαÏηÏηÏήÏιο θα δείξει ÏÏι κάÏÎ¿Î¹Î¿Ï ÎµÏιÏκÎÏθηκε Ïον ιÏÏÏÏοÏο www.something.com, αλλά ÏÏι ÏÎ¿Î¹Î¿Ï ÎµÏιÏκÎÏθηκε Ïον ιÏÏÏÏοÏο ή Ïοια ÏÏ Î³ÎºÎµÎºÏιμÎνη Ïελίδα -είδε. ΣÏÏε Ïο ÏονÏίκι ÏÎ¬Î½Ï Î±ÏÏ ÏÎ¹Ï ÎµÏιλογÎÏ Î³Î¹Î± ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏίεÏ:"> +είδε. ΣÏÏÏε Ïο ÏονÏίκι ÏÎ¬Î½Ï Î±ÏÏ ÏÎ¹Ï ÎµÏιλογÎÏ Î³Î¹Î± ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏίεÏ:"> @@ -81,7 +81,7 @@ Mouseover the options for further details:">--> "Î¥Ïοβολή και ÎλεγÏÎ¿Ï ÏιÏÏοÏοιηÏικÏν για μη δημÏÏια DNS ονÏμαÏα"> +"ÎκÏÏÏ Î±Î½ η ÏÏ Î³ÎºÎµÎºÏιμÎνη εÏιλογή ενεÏγοÏοιηθεί, Ïο ΠαÏαÏηÏηÏήÏιο δε θα καÏαγÏάÏει ΠιÏÏοÏοιηÏικά για ονÏμαÏα ÏÎ¿Ï Î´Îµ θα μÏοÏεί να εξακÏιβÏÏει μÎÏÏ ÏÎ¿Ï ÏÏ ÏÏήμαÏÎ¿Ï DNS."> @@ -92,7 +92,7 @@ Mouseover the options for further details:">--> - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 870e42fd751618c72991683fcfff714dff6c9d86 Author: Translation commit bot Date: Fri Sep 21 10:45:34 2018 + Update translations for https_everywhere_completed --- el/ssl-observatory.dtd | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/el/ssl-observatory.dtd b/el/ssl-observatory.dtd index 9492e4327..df645b0a8 100644 --- a/el/ssl-observatory.dtd +++ b/el/ssl-observatory.dtd @@ -1,6 +1,6 @@ - + --> "ÎÏαν βλÎÏÎµÎ¹Ï Îνα νÎο ÏιÏÏοÏοιηÏικÏ, ÏÎµÏ ÏÏο ΠαÏαÏηÏηÏήÏιο με Ïοιον ΠάÏοÏο Î¥ÏηÏεÏιÏν ÎιαδικÏÏÎ¿Ï ÎÏÎµÎ¹Ï ÏÏ Î½Î´ÎµÎ¸ÎµÎ¯."> +"Î ÏÏ Î³ÎºÎµÎºÏιμÎνη εÏιλογή θα ανακÏήÏει και θα αÏοÏÏείλει Ïον ÎÏ ÏÏνομο ÎÏÎ¹Î¸Î¼Ï Î£Ï ÏÏήμαÏÎ¿Ï (Autonomous System number) ÏÎ¿Ï Î´Î¹ÎºÏÏÎ¿Ï ÏαÏ. ÎÏ ÏÏ Î¸Î± Î¼Î±Ï Î²Î¿Î·Î¸Î®Ïει να ενÏοÏίÏÎ¿Ï Î¼Îµ εÏιθÎÏÎµÎ¹Ï ÎµÎ½Î±Î½Ïίον ÏÎ¿Ï HTTPS και να καθοÏίÏÎ¿Ï Î¼Îµ αν ÎÏÎ¿Ï Î½ ÏαÏαÏηÏηθεί εÏιθÎÏÎµÎ¹Ï Î±ÏÏ Î¼ÎÏη ÏÏÏÏ Î· Î£Ï Ïία και Ïο ÎÏάν ÏÏÎ¿Ï Î±Ï ÏÎÏ Î¿Î¹ εÏιθÎÏÎµÎ¹Ï ÎµÎ¯Î½Î±Î¹ ÏÏ Î³ÎºÏιÏικά Ïιο ÏÏ Î½Î·Î¸Î¹ÏμÎνεÏ."> +"ÎμÏάνιÏη ÏÏοειδοÏοίηÏÎ·Ï ÏÏαν Ïο ΠαÏαÏηÏηÏήÏιο ενÏοÏίζει Îνα ÏιÏÏοÏοιηÏÎ¹ÎºÏ ÏÎ¿Ï ÎÏει ανακληθεί, ÏÎ¿Ï Î´ÎµÎ½ Ïο ÎÏει ενÏοÏίÏει ο ÏεÏιηγηÏÎ®Ï ÏαÏ."> @@ -54,8 +54,8 @@ to turn it on?">--> +ÏÏÎλνει ανÏίγÏαÏα ÏÏν ÏιÏÏοÏοιηÏικÏν HTTPS ÏÏο ΠαÏαÏηÏηÏήÏιο, για να Î¼Î±Ï Î²Î¿Î·Î¸Î®Ïει να ανιÏνεÏÏÎ¿Ï Î¼Îµ εÏιθÎÏÎµÎ¹Ï 'ενδιάμεÏÎ¿Ï ÏαÏαÏηÏηÏή' και να βελÏιÏÏει Ïην αÏÏάλεια ÏÎ¿Ï Î Î±Î³ÎºÏÏÎ¼Î¹Î¿Ï ÎÏÏÎ¿Ï ÎºÎ±Î¹ (2) +Î¼Î±Ï ÎµÏιÏÏÎÏει να ÏÎ±Ï ÏÏοειδοÏοιοÏμε ÏÏεÏικά με μη-αÏÏÎ±Î»ÎµÎ¯Ï ÏÏ Î½Î´ÎÏÎµÎ¹Ï Î® εÏιθÎÏÎµÎ¹Ï ÏÏον ÏεÏιηγηÏή ÏαÏ."> https://www.example.com, Ïο ÏιÏÏοÏοιηÏÎ¹ÎºÏ -ÏÎ¿Ï Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Ïο ΠαÏαÏηÏηÏήÏιο θα δείξει ÏÏι κάÏÎ¿Î¹Î¿Ï ÎºÎ¬ÏÎ¿Î¹Î¿Ï ÎµÏιÏκÎÏθηκε +ÏÎ¿Ï Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Ïο ΠαÏαÏηÏηÏήÏιο θα δείξει ÏÏι κάÏÎ¿Î¹Î¿Ï ÎµÏιÏκÎÏθηκε Ïον ιÏÏÏÏοÏο www.something.com, αλλά ÏÏι ÏÎ¿Î¹Î¿Ï ÎµÏιÏκÎÏθηκε Ïον ιÏÏÏÏοÏο ή Ïοια ÏÏ Î³ÎºÎµÎºÏιμÎνη Ïελίδα -είδε. ΣÏÏε Ïο ÏονÏίκι ÏÎ¬Î½Ï Î±ÏÏ ÏÎ¹Ï ÎµÏιλογÎÏ Î³Î¹Î± ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏίεÏ:"> +είδε. ΣÏÏÏε Ïο ÏονÏίκι ÏÎ¬Î½Ï Î±ÏÏ ÏÎ¹Ï ÎµÏιλογÎÏ Î³Î¹Î± ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏίεÏ:"> @@ -81,7 +81,7 @@ Mouseover the options for further details:">--> "Î¥Ïοβολή και ÎλεγÏÎ¿Ï ÏιÏÏοÏοιηÏικÏν για μη δημÏÏια DNS ονÏμαÏα"> +"ÎκÏÏÏ Î±Î½ η ÏÏ Î³ÎºÎµÎºÏιμÎνη εÏιλογή ενεÏγοÏοιηθεί, Ïο ΠαÏαÏηÏηÏήÏιο δε θα καÏαγÏάÏει ΠιÏÏοÏοιηÏικά για ονÏμαÏα ÏÎ¿Ï Î´Îµ θα μÏοÏεί να εξακÏιβÏÏει μÎÏÏ ÏÎ¿Ï ÏÏ ÏÏήμαÏÎ¿Ï DNS."> @@ -92,7 +92,7 @@ Mouseover the options for further details:">--> - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] Update translations for support-portal
commit ad8f79c5838305c042c6c12242d9cdcc496a722f Author: Translation commit bot Date: Fri Sep 21 08:49:03 2018 + Update translations for support-portal --- contents+el.po | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/contents+el.po b/contents+el.po index 6df4cfec1..4b303592f 100644 --- a/contents+el.po +++ b/contents+el.po @@ -529,6 +529,9 @@ msgid "" "There may be a temporary connection issue, or the site operators may have " "allowed it to go offline without warning." msgstr "" +"ÎÏοÏεί να Ï ÏάÏÏει Îνα ÏÏοÏÏÏÎ¹Î½Ï ÏÏÏβλημα ÏÏνδεÏÎ·Ï Î® οι διαÏειÏιÏÏÎÏ ÏÎ·Ï " +"ιÏÏοÏÎµÎ»Î¯Î´Î±Ï Î¼ÏοÏεί να ÎÏÎ¿Ï Î½ εÏιÏÏÎÏει να βγει εκÏÏÏ ÏÏνδεÏÎ·Ï ÏÏÏÎ¯Ï " +"ÏÏοειδοÏοίηÏη. " #: http//localhost/misc/misc-10/ #: (content/misc/misc-10/contents+en.lrquestion.description) @@ -606,7 +609,7 @@ msgstr "" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) msgid "* Run \"pkg install tor\" (as root)." -msgstr "" +msgstr "* ÎκÏελÎÏÏε Ïο \"pkg install tor\" (ÏÏ root)." #: http//localhost/misc/misc-15/ #: (content/misc/misc-15/contents+en.lrquestion.seo_slug) @@ -791,14 +794,14 @@ msgstr "" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) msgid "* Run \"service tor start\" (as root)" -msgstr "" +msgstr "* ÎκÏελÎÏÏε Ïο \"service tor start\" (ÏÏ root)" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.description) msgid "* Run \"apt-get install tor\" (as root)." -msgstr "" +msgstr "* ÎκÏελÎÏÏε Ïο \"apt-get install tor\" (ÏÏ root)." #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -1652,7 +1655,7 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "* Run \"service tor reload\" (as root)." -msgstr "" +msgstr "* ÎκÏελÎÏÏε Ïο \"service tor reload\" (ÏÏ root)." #: http//localhost/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.description) @@ -2228,7 +2231,7 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "* Run \"apt-get install tor obfs4proxy\" (as root)." -msgstr "" +msgstr "* ÎκÏελÎÏÏε Ïο \"apt-get install tor obfs4proxy\" (ÏÏ root)." #: http//localhost/censorship/censorship-6/ #: (content/censorship/censorship-6/contents+en.lrquestion.seo_slug) @@ -2590,6 +2593,7 @@ msgstr "" #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "* Determine your Ubuntu version by running the following command:" msgstr "" +"* Î ÏοÏδιοÏίÏÏε Ïην ÎκδοÏη ÏÎ¿Ï Ubuntu ÏÎ±Ï ÎµÎºÏελÏνÏÎ±Ï Ïην ακÏÎ»Î¿Ï Î¸Î· ενÏολή:" #: http//localhost/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -2829,6 +2833,8 @@ msgid "" "* Add the gpg key used to sign the packages by running the following " "commands:" msgstr "" +"* Î ÏοÏθÎÏÏε Ïο κλειδί gpg ÏÎ¿Ï ÏÏηÏιμοÏοιείÏαι για Ïην Ï ÏογÏαÏή ÏÏν ÏακÎÏÏν " +"εκÏελÏνÏÎ±Ï ÏÎ¹Ï Î±ÎºÏÎ»Î¿Ï Î¸ÎµÏ ÎµÎ½ÏολÎÏ:" #: http//localhost/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.description) @@ -3139,6 +3145,8 @@ msgstr "" #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "* Run the following commands to install tor and check its signatures:" msgstr "" +"* ÎκÏελÎÏÏε ÏÎ¹Ï Î±ÎºÏÎ»Î¿Ï Î¸ÎµÏ ÎµÎ½ÏολÎÏ Î³Î¹Î± να εγκαÏαÏÏήÏεÏε Ïον tor και να " +"ελÎγξεÏε ÏÎ¹Ï Ï ÏογÏαÏÎÏ ÏÎ¿Ï :" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -3367,7 +3375,7 @@ msgstr "" #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.description) msgid "* Run \"service tor reload\" (as root)" -msgstr "" +msgstr "* ÎκÏελÎÏÏε Ïο \"service tor reload\" (ÏÏ root)" #: http//localhost/misc/misc-7/ #: (content/misc/misc-7/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit b974274f5566401e1b8a2e255f5b164697c7d026 Author: Translation commit bot Date: Fri Sep 21 08:48:22 2018 + Update translations for torbutton-browseronboardingproperties --- ka/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties index fa86e11a9..1e0cf62fb 100644 --- a/ka/browserOnboarding.properties +++ b/ka/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Go to Tor Network onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, thereâs no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network.button=á¬á áááá¡ á¡áá©ááááááá áá ááá ááááá¡ááá onboarding.tour-tor-circuit-display=á¬á áááá¡ á¡áá©áááááááá áá á onboarding.tour-tor-circuit-display.title=See your path. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Put dirlist_free_all back in routerlist_free_all for unit tests
commit 63219eda8aeb9aecf0e302179eb47a16ff26f6e9 Author: Nick Mathewson Date: Fri Sep 21 08:10:39 2018 -0400 Put dirlist_free_all back in routerlist_free_all for unit tests --- src/feature/nodelist/routerlist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 93597f89b..bfa1c85c0 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1424,6 +1424,7 @@ routerlist_free_all(void) { routerlist_free(routerlist); routerlist = NULL; + dirlist_free_all(); if (warned_nicknames) { SMARTLIST_FOREACH(warned_nicknames, char *, cp, tor_free(cp)); smartlist_free(warned_nicknames); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Set a release date
commit e62d92be5a9f1503d67d7d03e10eadcfc6be9b33 Author: Nick Mathewson Date: Fri Sep 21 08:12:50 2018 -0400 Set a release date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1a3428cf0..4eaa6db72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.5.2-alpha - 2018-09-2? +Changes in version 0.3.5.2-alpha - 2018-09-21 Tor 0.3.5.2-alpha fixes several bugs in 0.3.5.1-alpha, including one that made Tor think it had run out of sockets. Anybody running a relay or an onion service on 0.3.5.1-alpha should upgrade. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Bump to 0.3.5.2-alpha-dev
commit 55122bfe0425c54aeb28d0daa266cc4601247994 Author: Nick Mathewson Date: Fri Sep 21 09:11:33 2018 -0400 Bump to 0.3.5.2-alpha-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 230004946..dbeba512c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.2-alpha]) +AC_INIT([tor],[0.3.5.2-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 04702c346..9a15d8853 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.5.2-alpha" +!define VERSION "0.3.5.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/; !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f20db1318..09a29fa5a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.2-alpha" +#define VERSION "0.3.5.2-alpha-dev" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Picking up tor-0.3.5.2-alpha
commit 0f6d30c59d367193b4c0363432ac9554bb2a70e0 Author: Georg Koppen Date: Fri Sep 21 12:42:55 2018 + Picking up tor-0.3.5.2-alpha --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- projects/tor/config | 2 +- rbm.conf| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aec6bc4..9cd6c3f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ Tor Browser 8.5a2 -- September 24 2018 * All platforms - * Update Tor to 0.3.5.1-alpha + * Update Tor to 0.3.5.2-alpha * Update Torbutton to 2.1 * Bug 27097: Tor News signup banner * Bug 27663: Add New Identity menuitem again diff --git a/projects/tor/config b/projects/tor/config index 451c9bb..cc7811b 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.5.1-alpha +version: 0.3.5.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 65ffefa..0723a42 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a2' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.5a1 project_name: tor-browser ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
commit 4d4b91d3a7c3e4b8e84e42779eb7793d325655a1 Author: Translation commit bot Date: Fri Sep 21 13:16:13 2018 + Update translations for tails-perl5lib_completed --- el.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el.po b/el.po index 3bd065d82..259990cc0 100644 --- a/el.po +++ b/el.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2018-08-16 11:11+0200\n" -"PO-Revision-Date: 2018-08-13 13:42+\n" +"PO-Revision-Date: 2018-09-21 12:57+\n" "Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgstr "ΣÏάλμα" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "Îεν μÏοÏεί να βÏεθεί η ÏÏ ÏÎºÎµÏ Î® αÏÏ Ïην οÏοία ÏÏÎÏει Ïο Tails. ÎÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή \"toram\";" +msgstr "Îεν μÏοÏεί να βÏεθεί η ÏÏ ÏÎºÎµÏ Î® αÏÏ Ïην οÏοία ÏÏÎÏει Ïο Tails. ÎήÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή \"toram\";" #: ../lib/Tails/RunningSystem.pm:220 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "Îεν μÏοÏεί να βÏεθεί ο δίÏÎºÎ¿Ï Î±ÏÏ Ïον οÏοίο ÏÏÎÏει Ïο Tails. ÎÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή `toram' ;" +msgstr "Îεν μÏοÏεί να βÏεθεί ο δίÏÎºÎ¿Ï Î±ÏÏ Ïον οÏοίο ÏÏÎÏει Ïο Tails. ÎήÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή `toram' ;" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
commit fa65cab2f2e9ffacb9a679289104a22ce96f469c Author: Translation commit bot Date: Fri Sep 21 13:16:08 2018 + Update translations for tails-perl5lib --- el.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el.po b/el.po index 3bd065d82..259990cc0 100644 --- a/el.po +++ b/el.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2018-08-16 11:11+0200\n" -"PO-Revision-Date: 2018-08-13 13:42+\n" +"PO-Revision-Date: 2018-09-21 12:57+\n" "Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgstr "ΣÏάλμα" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "Îεν μÏοÏεί να βÏεθεί η ÏÏ ÏÎºÎµÏ Î® αÏÏ Ïην οÏοία ÏÏÎÏει Ïο Tails. ÎÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή \"toram\";" +msgstr "Îεν μÏοÏεί να βÏεθεί η ÏÏ ÏÎºÎµÏ Î® αÏÏ Ïην οÏοία ÏÏÎÏει Ïο Tails. ÎήÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή \"toram\";" #: ../lib/Tails/RunningSystem.pm:220 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "Îεν μÏοÏεί να βÏεθεί ο δίÏÎºÎ¿Ï Î±ÏÏ Ïον οÏοίο ÏÏÎÏει Ïο Tails. ÎÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή `toram' ;" +msgstr "Îεν μÏοÏεί να βÏεθεί ο δίÏÎºÎ¿Ï Î±ÏÏ Ïον οÏοίο ÏÏÎÏει Ïο Tails. ÎήÏÏÏ ÏÏηÏιμοÏοιήÏαÏε Ïην εÏιλογή `toram' ;" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck] Update translations for torcheck
commit 13948e16db77564bd7f0a2d8974f28252ecbe31a Author: Translation commit bot Date: Fri Sep 21 11:48:26 2018 + Update translations for torcheck --- el/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/torcheck.po b/el/torcheck.po index f17d17c24..c3dd567dd 100644 --- a/el/torcheck.po +++ b/el/torcheck.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-09-21 11:18+\n" +"PO-Revision-Date: 2018-09-21 11:25+\n" "Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgid "" msgstr "Î ÏοÏÏÏινοί ÏεÏνικοί λÏγοι δε Î¼Î±Ï ÎµÏÎÏÏεÏαν να διαÏιÏÏÏÏÎ¿Ï Î¼Îµ αν η IP διεÏÎ¸Ï Î½Ïή ÏÎ±Ï ÎµÎ¯Î½Î±Î¹ κÏÎ¼Î²Î¿Ï ÏÎ¿Ï https://www.torproject.org/\;>Tor." msgid "Your IP address appears to be: " -msgstr "Î IP διεÏÎ¸Ï Î½Ïή ÏÎ±Ï ÏαίνεÏαι να είναι η:" +msgstr "ΠδιεÏÎ¸Ï Î½Ïη IP ÏÎ±Ï ÏαίνεÏαι να είναι η:" msgid "Are you using Tor?" msgstr "ΧÏηÏιμοÏοιείÏε Ïο Tor;" @@ -78,7 +78,7 @@ msgid "" msgstr "Το Tor Project είναι ÎÎ½Î±Ï Î¼Î·-κεÏδοÏκοÏικÏÏ Î¿ÏγανιÏμÏÏ US 501(c)(3) αÏιεÏÏμÎÎ½Î¿Ï ÏÏην ÎÏÎµÏ Î½Î±, ανάÏÏÏ Î¾Î· και εκÏÎ±Î¯Î´ÎµÏ Ïη ÏÎ·Ï Î´Î¹ÎºÏÏ Î±ÎºÎ®Ï Î±Î½ÏÎ½Ï Î¼Î¯Î±Ï ÎºÎ±Î¹ ιδιÏÏικÏÏηÏαÏ." msgid "Learn More " -msgstr "ÎάθεÏε ÏεÏιÏÏÏÏεÏα" +msgstr "ÎάθεÏε ÏεÏιÏÏÏÏεÏα ·" msgid "Go" msgstr "Πήγαινε" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed
commit b35262e16b3a7349696dcbac17ed9173a18824ff Author: Translation commit bot Date: Fri Sep 21 11:18:24 2018 + Update translations for torcheck_completed --- el/torcheck.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/el/torcheck.po b/el/torcheck.po index 1e8918028..f17d17c24 100644 --- a/el/torcheck.po +++ b/el/torcheck.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-09-17 15:38+\n" +"PO-Revision-Date: 2018-09-21 11:18+\n" "Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgid "" "Please refer to the https://www.torproject.org/\;>Tor website " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "ΠαÏÎ±ÎºÎ±Î»Ï Î±ÏÎµÏ Î¸Ï Î½Î¸ÎµÎ¯Ïε ÏÏον https://www.torproject.org/\;>δικÏÏ Î±ÎºÏ ÏÏÏο ÏÎ¿Ï Tor για ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏÎ¯ÎµÏ ÏÏεÏικά με Ïην αÏÏαλή ÏÏήÏη ÏÎ¿Ï Tor. ΤÏÏα είÏÏε ελεÏθεÏοι να ÏεÏιηγηθείÏε ÏÏο ÎιαδίκÏÏ Î¿ ανÏÎ½Ï Î¼Î±." +msgstr "ΠαÏÎ±ÎºÎ±Î»Ï Î±ÏÎµÏ Î¸Ï Î½Î¸ÎµÎ¯Ïε ÏÏην https://www.torproject.org/\;>ÎÏÏοÏελίδα ÏÎ¿Ï Tor για ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏÎ¯ÎµÏ ÏÏεÏικά με Ïην αÏÏαλή ÏÏήÏη ÏÎ¿Ï Tor. ΤÏÏα είÏÏε ελεÏθεÏοι να ÏεÏιηγηθείÏε ÏÏο διαδίκÏÏ Î¿ ανÏÎ½Ï Î¼Î±." msgid "There is a security update available for Tor Browser." msgstr "Î¥ÏάÏÏει μια διαθÎÏιμη αναβάθμιÏη αÏÏÎ¬Î»ÎµÎ¹Î±Ï Î³Î¹Î± Ïον Tor Browser." @@ -50,10 +50,10 @@ msgid "" "href=\"https://www.torproject.org/\;>Tor website and specifically the https://www.torproject.org/docs/faq#DoesntWork\;>instructions for " "configuring your Tor client." -msgstr "Îν ÏÏοÏÏαθείÏε να ÏÏηÏιμοÏοιήÏεÏε Ïον ÏελάÏη Tor, μÏοÏείÏε να αναÏÏÎξεÏε ÏÏον https://www.torproject.org/\;>δικÏÏ Î±ÎºÏ ÏÏÏο ÏÎ¿Ï Tor και ÏÏ Î³ÎºÎµÎºÏιμÎνα ÏÎ¹Ï https://www.torproject.org/docs/faq#DoesntWork\;>Î¿Î´Î·Î³Î¯ÎµÏ Î³Î¹Î± Ïη ÏÏθμιÏη ÏÎ¿Ï ÏελάÏη Tor." +msgstr "Îν ÏÏοÏÏαθείÏε να ÏÏηÏιμοÏοιήÏεÏε Ïον ÏελάÏη Tor, μÏοÏείÏε να αναÏÏÎξεÏε ÏÏην https://www.torproject.org/\;>ÎÏÏοÏελίδα ÏÎ¿Ï Tor και ÏÏ Î³ÎºÎµÎºÏιμÎνα ÏÏÎ¹Ï https://www.torproject.org/docs/faq#DoesntWork\;>Î¿Î´Î·Î³Î¯ÎµÏ Î³Î¹Î± Ïη ÏÏθμιÏη ÏÎ¿Ï Tor client." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "ÎÏ ÏοÏμαÏÏε, Ïο αίÏημα ÏÎ±Ï Î±ÏÎÏÏ Ïε ή αÏÎÏÏειλε μη αναμενÏμενη αÏÏκÏιÏη." +msgstr "ÎÏ ÏοÏμαÏÏε, Ïο αίÏημα ÏÎ±Ï Î±ÏÎÏÏ Ïε ή λήÏθηκε μια αÏÏÏÏμενη αÏάνÏηÏη." msgid "" "A temporary service outage prevents us from determining if your source IP " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck] Update translations for torcheck
commit aba892d64bafd40c18ac21a3e27700df186f756c Author: Translation commit bot Date: Fri Sep 21 11:18:18 2018 + Update translations for torcheck --- el/torcheck.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/el/torcheck.po b/el/torcheck.po index 1e8918028..f17d17c24 100644 --- a/el/torcheck.po +++ b/el/torcheck.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-09-17 15:38+\n" +"PO-Revision-Date: 2018-09-21 11:18+\n" "Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgid "" "Please refer to the https://www.torproject.org/\;>Tor website " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "ΠαÏÎ±ÎºÎ±Î»Ï Î±ÏÎµÏ Î¸Ï Î½Î¸ÎµÎ¯Ïε ÏÏον https://www.torproject.org/\;>δικÏÏ Î±ÎºÏ ÏÏÏο ÏÎ¿Ï Tor για ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏÎ¯ÎµÏ ÏÏεÏικά με Ïην αÏÏαλή ÏÏήÏη ÏÎ¿Ï Tor. ΤÏÏα είÏÏε ελεÏθεÏοι να ÏεÏιηγηθείÏε ÏÏο ÎιαδίκÏÏ Î¿ ανÏÎ½Ï Î¼Î±." +msgstr "ΠαÏÎ±ÎºÎ±Î»Ï Î±ÏÎµÏ Î¸Ï Î½Î¸ÎµÎ¯Ïε ÏÏην https://www.torproject.org/\;>ÎÏÏοÏελίδα ÏÎ¿Ï Tor για ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏÎ¯ÎµÏ ÏÏεÏικά με Ïην αÏÏαλή ÏÏήÏη ÏÎ¿Ï Tor. ΤÏÏα είÏÏε ελεÏθεÏοι να ÏεÏιηγηθείÏε ÏÏο διαδίκÏÏ Î¿ ανÏÎ½Ï Î¼Î±." msgid "There is a security update available for Tor Browser." msgstr "Î¥ÏάÏÏει μια διαθÎÏιμη αναβάθμιÏη αÏÏÎ¬Î»ÎµÎ¹Î±Ï Î³Î¹Î± Ïον Tor Browser." @@ -50,10 +50,10 @@ msgid "" "href=\"https://www.torproject.org/\;>Tor website and specifically the https://www.torproject.org/docs/faq#DoesntWork\;>instructions for " "configuring your Tor client." -msgstr "Îν ÏÏοÏÏαθείÏε να ÏÏηÏιμοÏοιήÏεÏε Ïον ÏελάÏη Tor, μÏοÏείÏε να αναÏÏÎξεÏε ÏÏον https://www.torproject.org/\;>δικÏÏ Î±ÎºÏ ÏÏÏο ÏÎ¿Ï Tor και ÏÏ Î³ÎºÎµÎºÏιμÎνα ÏÎ¹Ï https://www.torproject.org/docs/faq#DoesntWork\;>Î¿Î´Î·Î³Î¯ÎµÏ Î³Î¹Î± Ïη ÏÏθμιÏη ÏÎ¿Ï ÏελάÏη Tor." +msgstr "Îν ÏÏοÏÏαθείÏε να ÏÏηÏιμοÏοιήÏεÏε Ïον ÏελάÏη Tor, μÏοÏείÏε να αναÏÏÎξεÏε ÏÏην https://www.torproject.org/\;>ÎÏÏοÏελίδα ÏÎ¿Ï Tor και ÏÏ Î³ÎºÎµÎºÏιμÎνα ÏÏÎ¹Ï https://www.torproject.org/docs/faq#DoesntWork\;>Î¿Î´Î·Î³Î¯ÎµÏ Î³Î¹Î± Ïη ÏÏθμιÏη ÏÎ¿Ï Tor client." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "ÎÏ ÏοÏμαÏÏε, Ïο αίÏημα ÏÎ±Ï Î±ÏÎÏÏ Ïε ή αÏÎÏÏειλε μη αναμενÏμενη αÏÏκÏιÏη." +msgstr "ÎÏ ÏοÏμαÏÏε, Ïο αίÏημα ÏÎ±Ï Î±ÏÎÏÏ Ïε ή λήÏθηκε μια αÏÏÏÏμενη αÏάνÏηÏη." msgid "" "A temporary service outage prevents us from determining if your source IP " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed
commit e9b69a5cde69ca423f6ad7806cb2493aa4e9faa9 Author: Translation commit bot Date: Fri Sep 21 11:48:32 2018 + Update translations for torcheck_completed --- el/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/torcheck.po b/el/torcheck.po index f17d17c24..c3dd567dd 100644 --- a/el/torcheck.po +++ b/el/torcheck.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-09-21 11:18+\n" +"PO-Revision-Date: 2018-09-21 11:25+\n" "Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgid "" msgstr "Î ÏοÏÏÏινοί ÏεÏνικοί λÏγοι δε Î¼Î±Ï ÎµÏÎÏÏεÏαν να διαÏιÏÏÏÏÎ¿Ï Î¼Îµ αν η IP διεÏÎ¸Ï Î½Ïή ÏÎ±Ï ÎµÎ¯Î½Î±Î¹ κÏÎ¼Î²Î¿Ï ÏÎ¿Ï https://www.torproject.org/\;>Tor." msgid "Your IP address appears to be: " -msgstr "Î IP διεÏÎ¸Ï Î½Ïή ÏÎ±Ï ÏαίνεÏαι να είναι η:" +msgstr "ΠδιεÏÎ¸Ï Î½Ïη IP ÏÎ±Ï ÏαίνεÏαι να είναι η:" msgid "Are you using Tor?" msgstr "ΧÏηÏιμοÏοιείÏε Ïο Tor;" @@ -78,7 +78,7 @@ msgid "" msgstr "Το Tor Project είναι ÎÎ½Î±Ï Î¼Î·-κεÏδοÏκοÏικÏÏ Î¿ÏγανιÏμÏÏ US 501(c)(3) αÏιεÏÏμÎÎ½Î¿Ï ÏÏην ÎÏÎµÏ Î½Î±, ανάÏÏÏ Î¾Î· και εκÏÎ±Î¯Î´ÎµÏ Ïη ÏÎ·Ï Î´Î¹ÎºÏÏ Î±ÎºÎ®Ï Î±Î½ÏÎ½Ï Î¼Î¯Î±Ï ÎºÎ±Î¹ ιδιÏÏικÏÏηÏαÏ." msgid "Learn More " -msgstr "ÎάθεÏε ÏεÏιÏÏÏÏεÏα" +msgstr "ÎάθεÏε ÏεÏιÏÏÏÏεÏα ·" msgid "Go" msgstr "Πήγαινε" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 6e585fb401a194cc356d002f9d59540ea9682857 Author: Translation commit bot Date: Fri Sep 21 13:17:54 2018 + Update translations for torbutton-torbuttondtd --- el/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/torbutton.dtd b/el/torbutton.dtd index bdd484bf1..4d9456a93 100644 --- a/el/torbutton.dtd +++ b/el/torbutton.dtd @@ -2,11 +2,11 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd] Update translations for torbutton-branddtd
commit 451959fcf2b60b59f54d51d1c58b628d7e853c1c Author: Translation commit bot Date: Fri Sep 21 13:17:36 2018 + Update translations for torbutton-branddtd --- el/brand.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/brand.dtd b/el/brand.dtd index 0e3db6284..65bd74eba 100644 --- a/el/brand.dtd +++ b/el/brand.dtd @@ -9,7 +9,7 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit a40168894aac152907530e1dfa70849be14c91d3 Author: Translation commit bot Date: Fri Sep 21 14:48:15 2018 + Update translations for torbutton-browseronboardingproperties --- el/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/browserOnboarding.properties b/el/browserOnboarding.properties index c84ca3e91..d8bfaa0e2 100644 --- a/el/browserOnboarding.properties +++ b/el/browserOnboarding.properties @@ -7,7 +7,7 @@ onboarding.tour-tor-welcome.title=ÎίÏÏε ÎÏοιμοÏ. onboarding.tour-tor-welcome.description=Î ÏεÏιηγηÏÎ®Ï Tor ÏÏοÏÏÎÏει Ïα Ï ÏηλÏÏεÏα ÏÏάνÏÎ±Ï ÏÏην ιδιÏÏικÏÏηÏα και Ïην αÏÏάλεια καÏά Ïην ÏεÏιήγηÏη ÏÏο διαδίκÏÏ Î¿. Î¤Ï Ïα είÏÏε ÏÏοÏÏαÏÎµÏ Î¼ÎÎ½Î¿Ï Î±ÏÏ Ïον ενÏοÏιÏμÏ, Ïην καÏαÏκοÏία και Ïη λογοκÏιÏία. Îία γÏήγοÏη δοκιμή θα ÏÎ±Ï Î´ÎµÎ¯Î¾ÎµÎ¹ ÏÏÏ. onboarding.tour-tor-welcome.button=ÎεκινήÏÏε ΤÏÏα -onboarding.tour-tor-privacy=ÎδιÏÏικÏÏηÏα +onboarding.tour-tor-privacy=ÎÏÏÏÏηÏο onboarding.tour-tor-privacy.title=ÎγνÏηÏÏε ενÏοÏιÏÏÎÏ ÎºÎ±Î¹ αδιάκÏιÏÎ¿Ï Ï. onboarding.tour-tor-privacy.description=Î Tor Browser αÏομονÏνει Ïα cookies και διαγÏάÏει Ïο ιÏÏοÏÎ¹ÎºÏ ÏεÏιήγηÏÎ·Ï Î¼ÏÎ»Î¹Ï ÎºÎ»ÎµÎ¯ÏεÏε Ïην καÏÏÎλα ÏαÏ. ÎÏ ÏÎÏ Î¿Î¹ ÏÏ Î¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï ÎµÎ¾Î±ÏÏÎ±Î»Î¯Î¶Î¿Ï Î½ Ïην ιδιÏÏικÏÏηÏά ÏÎ±Ï ÎºÎ±Î¹ Ïην αÏÏάλειά ÏÎ±Ï ÎµÎ¯Î½Î±Î¹ αÏÎ¿Î¸Î·ÎºÎµÏ Î¼ÎÎ½ÎµÏ ÏÏον ÏεÏιηγηÏή. ÎÏιλÎξÏε "ÎίκÏÏ Î¿ Tor" για να μάθεÏε ÏÏÏ ÏÎ±Ï ÏÏοÏÏαÏεÏÎ¿Ï Î¼Îµ Ïε εÏίÏεδο δικÏÏÎ¿Ï . onboarding.tour-tor-privacy.button=Πάμε ÏÏο ÎίκÏÏ Î¿ Tor ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
commit 278a2c05f73af327d336f9aada1190fd5f7bd093 Author: Translation commit bot Date: Fri Sep 21 14:48:19 2018 + Update translations for torbutton-browseronboardingproperties_completed --- el/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/browserOnboarding.properties b/el/browserOnboarding.properties index c84ca3e91..d8bfaa0e2 100644 --- a/el/browserOnboarding.properties +++ b/el/browserOnboarding.properties @@ -7,7 +7,7 @@ onboarding.tour-tor-welcome.title=ÎίÏÏε ÎÏοιμοÏ. onboarding.tour-tor-welcome.description=Î ÏεÏιηγηÏÎ®Ï Tor ÏÏοÏÏÎÏει Ïα Ï ÏηλÏÏεÏα ÏÏάνÏÎ±Ï ÏÏην ιδιÏÏικÏÏηÏα και Ïην αÏÏάλεια καÏά Ïην ÏεÏιήγηÏη ÏÏο διαδίκÏÏ Î¿. Î¤Ï Ïα είÏÏε ÏÏοÏÏαÏÎµÏ Î¼ÎÎ½Î¿Ï Î±ÏÏ Ïον ενÏοÏιÏμÏ, Ïην καÏαÏκοÏία και Ïη λογοκÏιÏία. Îία γÏήγοÏη δοκιμή θα ÏÎ±Ï Î´ÎµÎ¯Î¾ÎµÎ¹ ÏÏÏ. onboarding.tour-tor-welcome.button=ÎεκινήÏÏε ΤÏÏα -onboarding.tour-tor-privacy=ÎδιÏÏικÏÏηÏα +onboarding.tour-tor-privacy=ÎÏÏÏÏηÏο onboarding.tour-tor-privacy.title=ÎγνÏηÏÏε ενÏοÏιÏÏÎÏ ÎºÎ±Î¹ αδιάκÏιÏÎ¿Ï Ï. onboarding.tour-tor-privacy.description=Î Tor Browser αÏομονÏνει Ïα cookies και διαγÏάÏει Ïο ιÏÏοÏÎ¹ÎºÏ ÏεÏιήγηÏÎ·Ï Î¼ÏÎ»Î¹Ï ÎºÎ»ÎµÎ¯ÏεÏε Ïην καÏÏÎλα ÏαÏ. ÎÏ ÏÎÏ Î¿Î¹ ÏÏ Î¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï ÎµÎ¾Î±ÏÏÎ±Î»Î¯Î¶Î¿Ï Î½ Ïην ιδιÏÏικÏÏηÏά ÏÎ±Ï ÎºÎ±Î¹ Ïην αÏÏάλειά ÏÎ±Ï ÎµÎ¯Î½Î±Î¹ αÏÎ¿Î¸Î·ÎºÎµÏ Î¼ÎÎ½ÎµÏ ÏÏον ÏεÏιηγηÏή. ÎÏιλÎξÏε "ÎίκÏÏ Î¿ Tor" για να μάθεÏε ÏÏÏ ÏÎ±Ï ÏÏοÏÏαÏεÏÎ¿Ï Î¼Îµ Ïε εÏίÏεδο δικÏÏÎ¿Ï . onboarding.tour-tor-privacy.button=Πάμε ÏÏο ÎίκÏÏ Î¿ Tor ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] Update translations for support-portal
commit 736c5c52e53b55a948aea79ee971380966c1aff2 Author: Translation commit bot Date: Fri Sep 21 14:48:58 2018 + Update translations for support-portal --- contents+el.po | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/contents+el.po b/contents+el.po index 7517c547c..85cb87872 100644 --- a/contents+el.po +++ b/contents+el.po @@ -2525,6 +2525,8 @@ msgid "" "If you are using HTTPS, your website URL will begin" " with \"https://\;." msgstr "" +"Îν ÏÏηÏιμοÏοιείÏε HTTPS, η διεÏÎ¸Ï Î½Ïη URL ÏÎ·Ï " +"ιÏÏοÏÎµÎ»Î¯Î´Î±Ï ÏÎ±Ï Î¸Î± ξεκινά με Ïο \"https://\;." #: http//localhost/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description) @@ -2532,6 +2534,8 @@ msgid "" "https://blog.torproject.org/tor-heart-onion-browser-and-; "more-ios-tor\">Learn more about Onion Browser." msgstr "" +"https://blog.torproject.org/tor-heart-onion-browser-and-; +"more-ios-tor\">ÎάθεÏε ÏεÏιÏÏÏÏεÏα ÏÏεÏικά με Ïον Onion Browser." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -2547,7 +2551,7 @@ msgstr "Nickname ididnteditheconfig" #: http//localhost/misc/misc-6/ #: (content/misc/misc-6/contents+en.lrquestion.seo_slug) msgid "does-tor-keep-logs" -msgstr "" +msgstr "does-tor-keep-logs" #: http//localhost/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2834,7 +2838,7 @@ msgstr "" #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.seo_slug) msgid "need-tor-browser-language-not-english" -msgstr "" +msgstr "need-tor-browser-language-not-english" #: http//localhost/tormobile/tormobile-5/ #: (content/tormobile/tormobile-5/contents+en.lrquestion.description) @@ -2846,7 +2850,7 @@ msgstr "" #: http//localhost/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.seo_slug) msgid "to-use-gettor-via-twitter" -msgstr "" +msgstr "to-use-gettor-via-twitter" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -2862,7 +2866,7 @@ msgstr "" #: http//localhost/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "* MacOS (OS X)" -msgstr "" +msgstr "* MacOS (OS X)" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -3025,7 +3029,7 @@ msgstr "" #: http//localhost/operators/operators-2/ #: (content/operators/operators-2/contents+en.lrquestion.seo_slug) msgid "how-do-i-run-an-exit" -msgstr "" +msgstr "how-do-i-run-an-exit" #: http//localhost/ (content/contents+en.lrshowcase.title) msgid "How can we help?" @@ -3063,12 +3067,12 @@ msgstr "Tor Messenger" #: http//localhost/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.seo_slug) msgid "running-tor-browser-make-me-relay" -msgstr "" +msgstr "running-tor-browser-make-me-relay" #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) msgid "* Español (es-ES)" -msgstr "" +msgstr "* Español (es-ES)" #: http//localhost/tbb/tbb-19/ #: (content/tbb/tbb-19/contents+en.lrquestion.seo_slug) @@ -3117,7 +3121,7 @@ msgstr "ÎÏοÏÏ Î½Î± ÏÏÎÎ¾Ï Ïον Tor Ïε μια ÏÏ ÏÎºÎµÏ Î® iOS;" #: http//localhost/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "* Windows" -msgstr "" +msgstr "* Windows" #: http//localhost/tormobile/tormobile-4/ #: (content/tormobile/tormobile-4/contents+en.lrquestion.title) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] Update translations for support-portal
commit aafd8cbc1133045a788fa56059fb6cabff986f0a Author: Translation commit bot Date: Fri Sep 21 15:18:53 2018 + Update translations for support-portal --- contents+el.po | 6 ++ 1 file changed, 6 insertions(+) diff --git a/contents+el.po b/contents+el.po index 85cb87872..40cb2812d 100644 --- a/contents+el.po +++ b/contents+el.po @@ -777,6 +777,9 @@ msgid "" "We configure NoScript to allow JavaScript by default in Tor Browser because " "many websites will not work with JavaScript disabled." msgstr "" +"Î¡Ï Î¸Î¼Î¯Î¶Î¿Ï Î¼Îµ Ïο NoScript ÏÏÏε να εÏιÏÏÎÏεÏαι αÏÏ ÏÏοεÏιλογή η JavaScript ÏÏον " +"Tor Browser, εÏειδή ÏολλÎÏ Î¹ÏÏοÏÎµÎ»Î¯Î´ÎµÏ Î´ÎµÎ½ θα λειÏÎ¿Ï ÏγοÏν με Ïην " +"αÏενεÏγοÏοίηÏη ÏÎ·Ï JavaScript." #: http//localhost/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -846,6 +849,9 @@ msgid "" "Tor is funded by a number of different sponsors including US federal " "agencies, private foundations, and individual donors." msgstr "" +"Το Tor ÏÏημαÏοδοÏείÏαι αÏÏ Î´Î¹Î¬ÏοÏÎ¿Ï Ï ÏοÏηγοÏÏ, ÏÏ Î¼ÏεÏιλαμβανομÎνÏν, " +"ομοÏÏονδιακÏν Ï ÏηÏεÏιÏν ÏÏν ÎÎ Î, ιδιÏÏικÏν ιδÏÏ Î¼Î¬ÏÏν και μεμονÏμÎνÏν " +"δÏÏηÏÏν." #: http//localhost/tbb/tbb-19/ #: (content/tbb/tbb-19/contents+en.lrquestion.description) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Introduce per-service HiddenServiceExportCircuitID torrc option.
commit 27d7491f5a761c58fc687f0b816b80ff9f7a1a1d Author: George Kadianakis Date: Wed Sep 12 14:40:19 2018 +0300 Introduce per-service HiddenServiceExportCircuitID torrc option. Moves code to a function, better viewed with --color-moved. --- changes/bug4700 | 5 + src/app/config/config.c | 1 + src/core/or/connection_edge.c | 52 ++- src/feature/hs/hs_config.c| 20 - src/feature/hs/hs_service.c | 13 +++ src/feature/hs/hs_service.h | 5 + 6 files changed, 75 insertions(+), 21 deletions(-) diff --git a/changes/bug4700 b/changes/bug4700 new file mode 100644 index 0..3c8d9b19b --- /dev/null +++ b/changes/bug4700 @@ -0,0 +1,5 @@ + o Minor features (onion services): +- Version 3 onion services can now use the per-service + HiddenServiceExportCircuitID option to differentiate client circuits by + using the HAProxy proxy protocol which assigns IP addresses to inbound client + circuits. Closes ticket 4700. Patch by Mahrud Sayrafi. diff --git a/src/app/config/config.c b/src/app/config/config.c index 1adeb75c9..13421f103 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -457,6 +457,7 @@ static config_var_t option_vars_[] = { VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL), + VAR("HiddenServiceExportCircuitID", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"), V(HidServAuth, LINELIST, NULL), V(ClientOnionAuthDir, FILENAME, NULL), diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index a85419376..8b333a6f4 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -597,6 +597,33 @@ connected_cell_format_payload(uint8_t *payload_out, return connected_payload_len; } +/* DOCDOCDOC */ +static void +send_ha_proxy_header(const edge_connection_t *edge_conn, + connection_t *conn) +{ + char buf[512]; + char dst_ipv6[39] = "::1"; + /* See RFC4193 regarding fc00::/7 */ + char src_ipv6_prefix[34] = "fc00:dead:beef:4dad:"; + /* TODO: retain virtual port and use as destination port */ + uint16_t dst_port = 443; + uint16_t src_port = 0; + uint32_t gid = 0; + + if (edge_conn->on_circuit != NULL) { +gid = TO_ORIGIN_CIRCUIT(edge_conn->on_circuit)->global_identifier; +src_port = gid & 0x; + } + + gid = (gid == 0) ? 1 : gid; + src_port = (src_port == 0) ? 1 : src_port; + + tor_snprintf(buf, sizeof(buf), "PROXY TCP6 %s:%x %s %d %d\r\n", + src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); + connection_buf_add(buf, strlen(buf), conn); +} + /** Connected handler for exit connections: start writing pending * data, deliver 'CONNECTED' relay cells as appropriate, and check * any pending data that may have been received. */ @@ -618,28 +645,13 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) conn->state = EXIT_CONN_STATE_OPEN; - /* Include Proxy Protocol header. */ - char buf[512]; - char dst_ipv6[39] = "::1"; - /* See RFC4193 regarding fc00::/7 */ - char src_ipv6_prefix[34] = "fc00:dead:beef:4dad:"; - /* TODO: retain virtual port and use as destination port */ - uint16_t dst_port = 443; - uint16_t src_port = 0; - uint32_t gid = 0; - - if (edge_conn->on_circuit != NULL) { -gid = TO_ORIGIN_CIRCUIT(edge_conn->on_circuit)->global_identifier; -src_port = gid & 0x; + /* If it's an onion service connection, we might want to include the proxy + * protocol header */ + if (edge_conn->hs_ident && + hs_service_exports_circuit_id(_conn->hs_ident->identity_pk)) { +send_ha_proxy_header(edge_conn, conn); } - gid = (gid == 0) ? 1 : gid; - src_port = (src_port == 0) ? 1 : src_port; - - tor_snprintf(buf, sizeof(buf), "PROXY TCP6 %s:%x %s %d %d\r\n", - src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); - connection_buf_add(buf, strlen(buf), conn); - connection_watch_events(conn, READ_EVENT); /* stop writing, keep reading */ if (connection_get_outbuf_len(conn)) /* in case there are any queued relay * cells */ diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index eaeb58829..16bfe7c54 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -188,6 +188,11 @@ config_has_invalid_options(const config_line_t *line_, NULL /* End marker. */ }; + const char *opts_exclude_v2[] = { +"HiddenServiceExportCircuitID", +NULL /* End marker. */ + }; + /* Defining the size explicitly allows us to take advantage of the compiler * which warns us if we ever bump the max version but forget to grow this * array. The plus
[tor-commits] [tor/master] Change HiddenServiceExportCircuitID to take a string parameter: the protocol.
commit 9b511dc5d6a9e44bd8c8c644ad9445cab7cdafe2 Author: Alexander Færøy Date: Sat Sep 15 16:33:31 2018 +0300 Change HiddenServiceExportCircuitID to take a string parameter: the protocol. This patch changes HiddenServiceExportCircuitID so instead of being a boolean it takes a string, which is the protocol. Currently only the 'haproxy' protocol is defined. See: https://bugs.torproject.org/4700 --- doc/tor.1.txt | 8 src/core/or/connection_edge.c | 20 +--- src/core/or/connection_edge.h | 8 ++-- src/feature/hs/hs_config.c| 29 +++-- src/feature/hs/hs_service.c | 6 +++--- src/feature/hs/hs_service.h | 14 -- src/test/test_hs_service.c| 19 --- 7 files changed, 77 insertions(+), 27 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index abd1fdefa..d260eec10 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2835,10 +2835,10 @@ The following options are used to configure a hidden service. not an authorization mechanism; it is instead meant to be a mild inconvenience to port-scanners.) (Default: 0) -[[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** **0**|**1**:: - If set to 1, then the onion service will use the HAProxy proxy protocol to - assign a unique IPv6 address (in an unused IPv6 range) to each inbound - client circuit. (Default: 0) +[[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** __protocol__:: + The onion service will use the given protocol to expose the global circuit + identifier of each inbound client circuit via the selected protocol. The only + protocol supported right now \'haproxy\'. This option is only for v3 services. [[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__:: The maximum number of simultaneous streams (connections) per rendezvous diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 62d12f498..0eff007e3 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -600,10 +600,15 @@ connected_cell_format_payload(uint8_t *payload_out, /* This is an onion service client connection: Export the client circuit ID * according to the HAProxy proxy protocol. */ STATIC void -export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn, -connection_t *conn) +export_hs_client_circuit_id(const edge_connection_t *edge_conn, +connection_t *conn, +hs_circuit_id_protocol_t protocol) { - char *buf; + /* We only support HAProxy right now. */ + if (protocol != HS_CIRCUIT_ID_PROTOCOL_HAPROXY) +return; + + char *buf = NULL; const char dst_ipv6[] = "::1"; /* See RFC4193 regarding fc00::/7 */ const char src_ipv6_prefix[] = "fc00:dead:beef:4dad:"; @@ -655,10 +660,11 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) conn->state = EXIT_CONN_STATE_OPEN; /* If it's an onion service connection, we might want to include the proxy - * protocol header */ - if (edge_conn->hs_ident && - hs_service_exports_circuit_id(_conn->hs_ident->identity_pk)) { -export_hs_client_circuit_id_haproxy(edge_conn, conn); + * protocol header: */ + if (edge_conn->hs_ident) { +hs_circuit_id_protocol_t circuit_id_protocol = + hs_service_exports_circuit_id(_conn->hs_ident->identity_pk); +export_hs_client_circuit_id(edge_conn, conn, circuit_id_protocol); } connection_watch_events(conn, READ_EVENT); /* stop writing, keep reading */ diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index adec4998e..c5ad3128a 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -14,6 +14,8 @@ #include "lib/testsupport/testsupport.h" +#include "feature/hs/hs_service.h" + edge_connection_t *TO_EDGE_CONN(connection_t *); entry_connection_t *TO_ENTRY_CONN(connection_t *); entry_connection_t *EDGE_TO_ENTRY_CONN(edge_connection_t *); @@ -244,8 +246,10 @@ STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn, STATIC int connection_ap_process_http_connect(entry_connection_t *conn); STATIC void -export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn, -connection_t *conn); +export_hs_client_circuit_id(const edge_connection_t *edge_conn, +connection_t *conn, +hs_circuit_id_protocol_t protocol); + #endif /* defined(CONNECTION_EDGE_PRIVATE) */ #endif /* !defined(TOR_CONNECTION_EDGE_H) */ diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 16bfe7c54..2378a4d3b 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -145,6 +145,31 @@ helper_parse_uint64(const char *opt, const char *value, uint64_t min, return ret; } +/** Helper function: Given a configuration option and its
[tor-commits] [tor/master] Improve export_hs_client_circuit_id() function.
commit 5d34a8cbbb8ac4b6edd6800e10b5cb6dba1dcbcb Author: George Kadianakis Date: Wed Sep 12 14:43:23 2018 +0300 Improve export_hs_client_circuit_id() function. - Change default values. - Beautify. - Documentation. --- src/core/or/connection_edge.c | 31 +-- src/core/or/connection_edge.h | 3 +++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 8b333a6f4..9af03f7f2 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -597,31 +597,34 @@ connected_cell_format_payload(uint8_t *payload_out, return connected_payload_len; } -/* DOCDOCDOC */ -static void -send_ha_proxy_header(const edge_connection_t *edge_conn, - connection_t *conn) +/* This is an onion service client connection: Export the client circuit ID + * according to the HAProxy proxy protocol. */ +STATIC void +export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn, +connection_t *conn) { - char buf[512]; - char dst_ipv6[39] = "::1"; + char *buf; + const char dst_ipv6[] = "::1"; /* See RFC4193 regarding fc00::/7 */ - char src_ipv6_prefix[34] = "fc00:dead:beef:4dad:"; + const char src_ipv6_prefix[] = "fc00:dead:beef:4dad:"; /* TODO: retain virtual port and use as destination port */ uint16_t dst_port = 443; - uint16_t src_port = 0; - uint32_t gid = 0; + uint16_t src_port = 1; /* default value */ + uint32_t gid = 0; /* default value */ + /* Generate a GID and source port for this client */ if (edge_conn->on_circuit != NULL) { gid = TO_ORIGIN_CIRCUIT(edge_conn->on_circuit)->global_identifier; src_port = gid & 0x; } - gid = (gid == 0) ? 1 : gid; - src_port = (src_port == 0) ? 1 : src_port; + /* Build the string */ + tor_asprintf(, "PROXY TCP6 %s:%x %s %d %d\r\n", + src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); - tor_snprintf(buf, sizeof(buf), "PROXY TCP6 %s:%x %s %d %d\r\n", - src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); connection_buf_add(buf, strlen(buf), conn); + + tor_free(buf); } /** Connected handler for exit connections: start writing pending @@ -649,7 +652,7 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) * protocol header */ if (edge_conn->hs_ident && hs_service_exports_circuit_id(_conn->hs_ident->identity_pk)) { -send_ha_proxy_header(edge_conn, conn); +export_hs_client_circuit_id_haproxy(edge_conn, conn); } connection_watch_events(conn, READ_EVENT); /* stop writing, keep reading */ diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index 24968b277..adec4998e 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -243,6 +243,9 @@ STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn, rewrite_result_t *out); STATIC int connection_ap_process_http_connect(entry_connection_t *conn); +STATIC void +export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn, +connection_t *conn); #endif /* defined(CONNECTION_EDGE_PRIVATE) */ #endif /* !defined(TOR_CONNECTION_EDGE_H) */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Save original virtual port in edge conn HS ident.
commit 6069185bcc61fe797582b9b9826a5d52e4aabb22 Author: George Kadianakis Date: Wed Sep 12 15:52:41 2018 +0300 Save original virtual port in edge conn HS ident. --- src/core/or/connection_edge.c | 8 ++-- src/feature/hs/hs_common.c| 5 + src/feature/hs/hs_ident.h | 4 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 9af03f7f2..891e92217 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -607,8 +607,7 @@ export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn, const char dst_ipv6[] = "::1"; /* See RFC4193 regarding fc00::/7 */ const char src_ipv6_prefix[] = "fc00:dead:beef:4dad:"; - /* TODO: retain virtual port and use as destination port */ - uint16_t dst_port = 443; + uint16_t dst_port = 0; uint16_t src_port = 1; /* default value */ uint32_t gid = 0; /* default value */ @@ -618,6 +617,11 @@ export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn, src_port = gid & 0x; } + /* Grab the original dest port from the hs ident */ + if (edge_conn->hs_ident) { +dst_port = edge_conn->hs_ident->orig_virtual_port; + } + /* Build the string */ tor_asprintf(, "PROXY TCP6 %s:%x %s %d %d\r\n", src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index 12405a79c..c36892e0f 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -882,6 +882,11 @@ hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn) smartlist_free(matching_ports); if (chosen_port) { if (!(chosen_port->is_unix_addr)) { + /* save the original destination before we overwrite it */ + if (conn->hs_ident) { +conn->hs_ident->orig_virtual_port = TO_CONN(conn)->port; + } + /* Get a non-AF_UNIX connection ready for connection_exit_connect() */ tor_addr_copy(_CONN(conn)->addr, _port->real_addr); TO_CONN(conn)->port = chosen_port->real_port; diff --git a/src/feature/hs/hs_ident.h b/src/feature/hs/hs_ident.h index 92d15b052..ab87d16d1 100644 --- a/src/feature/hs/hs_ident.h +++ b/src/feature/hs/hs_ident.h @@ -111,6 +111,10 @@ typedef struct hs_ident_edge_conn_t { * in the onion address. */ ed25519_public_key_t identity_pk; + /* The original virtual port that was used by the client to access the onion + * service, regardless of the internal port forwarding that might have + * happened on the service-side. */ + uint16_t orig_virtual_port; /* XXX: Client authorization. */ } hs_ident_edge_conn_t; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Encode the 32-bit Global Identifier as 2 x 16-bit in the IPv6 address.
commit 8f085841ef40f00bbc2bb146a2d555aba527738f Author: Alexander Færøy Date: Fri Sep 14 21:37:36 2018 +0200 Encode the 32-bit Global Identifier as 2 x 16-bit in the IPv6 address. Without this patch we would encode the IPv6 address' last part as :: instead of ::: when the GID is UINT32_MAX. See: https://bugs.torproject.org/4700 --- src/core/or/connection_edge.c | 6 -- src/test/test_hs_service.c| 26 ++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 891e92217..62d12f498 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -623,8 +623,10 @@ export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn, } /* Build the string */ - tor_asprintf(, "PROXY TCP6 %s:%x %s %d %d\r\n", - src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); + tor_asprintf(, "PROXY TCP6 %s:%x:%x %s %d %d\r\n", + src_ipv6_prefix, + gid >> 16, gid & 0x, + dst_ipv6, src_port, dst_port); connection_buf_add(buf, strlen(buf), conn); diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 0a1c866d6..2b8d6e597 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -2061,6 +2061,32 @@ test_export_client_circuit_id(void *arg) export_hs_client_circuit_id_haproxy(edge_conn, conn); cp2 = buf_get_contents(conn->outbuf, ); tt_str_op(cp1, OP_NE, cp2); + tor_free(cp1); + + /* Check that GID with UINT32_MAX works. */ + or_circ->global_identifier = UINT32_MAX; + + export_hs_client_circuit_id_haproxy(edge_conn, conn); + cp1 = buf_get_contents(conn->outbuf, ); + tt_str_op(cp1, OP_EQ, +"PROXY TCP6 fc00:dead:beef:4dad::: ::1 65535 42\r\n"); + tor_free(cp1); + + /* Check that GID with UINT16_MAX works. */ + or_circ->global_identifier = UINT16_MAX; + + export_hs_client_circuit_id_haproxy(edge_conn, conn); + cp1 = buf_get_contents(conn->outbuf, ); + tt_str_op(cp1, OP_EQ, +"PROXY TCP6 fc00:dead:beef:4dad::0: ::1 65535 42\r\n"); + tor_free(cp1); + + /* Check that GID with UINT16_MAX + 7 works. */ + or_circ->global_identifier = UINT16_MAX + 7; + + export_hs_client_circuit_id_haproxy(edge_conn, conn); + cp1 = buf_get_contents(conn->outbuf, ); + tt_str_op(cp1, OP_EQ, "PROXY TCP6 fc00:dead:beef:4dad::1:6 ::1 6 42\r\n"); done: UNMOCK(connection_write_to_buf_impl_); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add proxy headers as early as possible.
commit 3477a73af99eb72f8374928fdc2fab4858485219 Author: Alexander Færøy Date: Sat Sep 15 22:17:57 2018 +0200 Add proxy headers as early as possible. This patch moves the logic that adds the proxy headers to an earlier point in the exit connection lifetime, which ensures that the application data cannot be written to the outbuf before the proxy header is added. See: https://bugs.torproject.org/4700 --- src/core/or/connection_edge.c | 21 ++--- src/core/or/connection_edge.h | 3 +-- src/test/test_hs_service.c| 15 +-- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 0eff007e3..ab2acaa39 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -600,8 +600,7 @@ connected_cell_format_payload(uint8_t *payload_out, /* This is an onion service client connection: Export the client circuit ID * according to the HAProxy proxy protocol. */ STATIC void -export_hs_client_circuit_id(const edge_connection_t *edge_conn, -connection_t *conn, +export_hs_client_circuit_id(edge_connection_t *edge_conn, hs_circuit_id_protocol_t protocol) { /* We only support HAProxy right now. */ @@ -633,7 +632,7 @@ export_hs_client_circuit_id(const edge_connection_t *edge_conn, gid >> 16, gid & 0x, dst_ipv6, src_port, dst_port); - connection_buf_add(buf, strlen(buf), conn); + connection_buf_add(buf, strlen(buf), TO_CONN(edge_conn)); tor_free(buf); } @@ -659,14 +658,6 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) conn->state = EXIT_CONN_STATE_OPEN; - /* If it's an onion service connection, we might want to include the proxy - * protocol header: */ - if (edge_conn->hs_ident) { -hs_circuit_id_protocol_t circuit_id_protocol = - hs_service_exports_circuit_id(_conn->hs_ident->identity_pk); -export_hs_client_circuit_id(edge_conn, conn, circuit_id_protocol); - } - connection_watch_events(conn, READ_EVENT); /* stop writing, keep reading */ if (connection_get_outbuf_len(conn)) /* in case there are any queued relay * cells */ @@ -3452,6 +3443,14 @@ handle_hs_exit_conn(circuit_t *circ, edge_connection_t *conn) hs_inc_rdv_stream_counter(origin_circ); + /* If it's an onion service connection, we might want to include the proxy + * protocol header: */ + if (conn->hs_ident) { +hs_circuit_id_protocol_t circuit_id_protocol = + hs_service_exports_circuit_id(>hs_ident->identity_pk); +export_hs_client_circuit_id(conn, circuit_id_protocol); + } + /* Connect tor to the hidden service destination. */ connection_exit_connect(conn); diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index c5ad3128a..5b694428d 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -246,8 +246,7 @@ STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn, STATIC int connection_ap_process_http_connect(entry_connection_t *conn); STATIC void -export_hs_client_circuit_id(const edge_connection_t *edge_conn, -connection_t *conn, +export_hs_client_circuit_id(edge_connection_t *edge_conn, hs_circuit_id_protocol_t protocol); #endif /* defined(CONNECTION_EDGE_PRIVATE) */ diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 955bcc8af..dace2b63d 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -2047,8 +2047,7 @@ test_export_client_circuit_id(void *arg) or_circ->global_identifier = 666; /* Export circuit ID */ - export_hs_client_circuit_id(edge_conn, conn, - service->config.circuit_id_protocol); + export_hs_client_circuit_id(edge_conn, service->config.circuit_id_protocol); /* Check contents */ cp1 = buf_get_contents(conn->outbuf, ); @@ -2059,8 +2058,7 @@ test_export_client_circuit_id(void *arg) or_circ->global_identifier = 22; /* check changes */ - export_hs_client_circuit_id(edge_conn, conn, - service->config.circuit_id_protocol); + export_hs_client_circuit_id(edge_conn, service->config.circuit_id_protocol); cp2 = buf_get_contents(conn->outbuf, ); tt_str_op(cp1, OP_NE, cp2); tor_free(cp1); @@ -2068,8 +2066,7 @@ test_export_client_circuit_id(void *arg) /* Check that GID with UINT32_MAX works. */ or_circ->global_identifier = UINT32_MAX; - export_hs_client_circuit_id(edge_conn, conn, - service->config.circuit_id_protocol); + export_hs_client_circuit_id(edge_conn, service->config.circuit_id_protocol); cp1 = buf_get_contents(conn->outbuf, ); tt_str_op(cp1, OP_EQ, "PROXY TCP6 fc00:dead:beef:4dad::: ::1 65535 42\r\n"); @@ -2078,8 +2075,7 @@
[tor-commits] [tor/master] Document the haproxy option of HiddenServiceExportCircuitID.
commit 03ef4ec466fd7f1de097a7b0244ca5bc8cc32b18 Author: Alexander Færøy Date: Thu Sep 20 21:15:25 2018 +0200 Document the haproxy option of HiddenServiceExportCircuitID. See: https://bugs.torproject.org/4700 --- doc/tor.1.txt | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index df298e1d7..124b01053 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2839,7 +2839,28 @@ The following options are used to configure a hidden service. The onion service will use the given protocol to expose the global circuit identifier of each inbound client circuit via the selected protocol. The only protocol supported right now \'haproxy\'. This option is only for v3 - services. (Default: none) + services. (Default: none) + + + + The haproxy option works in the following way: when the feature is + enabled, the Tor process will write a header line when a client is connecting + to the onion service. The header will look like this: + + + + "PROXY TCP6 fc00:dead:beef:4dad::: ::1 65535 42\r\n" + + + + We encode the "global circuit identifier" as the last 32-bits of the first + IPv6 address. All other values in the header can safely be ignored. You can + compute the global circuit identifier using the following formula given the + IPv6 address "fc00:dead:beef:4dad::AABB:CCDD": + + + + global_circuit_id = (0xAA << 24) + (0xBB << 16) + (0xCC << 8) + 0xDD; + + + + In the case above, where the last 32-bit is 0x, the global circuit + identifier would be 4294967295. You can use this value together with Tor's + control port where it is possible to terminate a circuit given the global + circuit identifier. For more information about this see controls-spec.txt. + + + + The HAProxy version 1 proxy protocol is described in detail at + https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt [[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__:: The maximum number of simultaneous streams (connections) per rendezvous ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add man page entry.
commit e44e6a1857ff8ad39d3e298b512e8c8a1e513c99 Author: George Kadianakis Date: Thu Sep 13 17:37:05 2018 +0300 Add man page entry. --- doc/tor.1.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 869a8cedd..abd1fdefa 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2835,6 +2835,11 @@ The following options are used to configure a hidden service. not an authorization mechanism; it is instead meant to be a mild inconvenience to port-scanners.) (Default: 0) +[[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** **0**|**1**:: + If set to 1, then the onion service will use the HAProxy proxy protocol to + assign a unique IPv6 address (in an unused IPv6 range) to each inbound + client circuit. (Default: 0) + [[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__:: The maximum number of simultaneous streams (connections) per rendezvous circuit. The maximum value allowed is 65535. (Setting this to 0 will allow ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Support 'none' in torrc for HiddenServiceExportCircuitID.
commit 8ecaf41003cc5b513cf26c4ae176d5043f5a6a93 Author: Alexander Færøy Date: Thu Sep 20 20:59:42 2018 +0200 Support 'none' in torrc for HiddenServiceExportCircuitID. See: https://bugs.torproject.org/4700 --- doc/tor.1.txt | 3 ++- src/feature/hs/hs_config.c | 5 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d260eec10..df298e1d7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2838,7 +2838,8 @@ The following options are used to configure a hidden service. [[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** __protocol__:: The onion service will use the given protocol to expose the global circuit identifier of each inbound client circuit via the selected protocol. The only - protocol supported right now \'haproxy\'. This option is only for v3 services. + protocol supported right now \'haproxy\'. This option is only for v3 + services. (Default: none) [[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__:: The maximum number of simultaneous streams (connections) per rendezvous diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 2378a4d3b..93d7403df 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -161,8 +161,11 @@ helper_parse_circuit_id_protocol(const char *key, const char *value, int *ok) if (! strcasecmp(value, "haproxy")) { *ok = 1; ret = HS_CIRCUIT_ID_PROTOCOL_HAPROXY; + } else if (! strcasecmp(value, "none")) { +*ok = 1; +ret = HS_CIRCUIT_ID_PROTOCOL_NONE; } else { -log_warn(LD_CONFIG, "%s must be 'haproxy'.", key); +log_warn(LD_CONFIG, "%s must be 'haproxy' or 'none'.", key); goto err; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add unittest for HiddenServiceExportCircuitID.
commit b2092f1ced891737d83915f027b6776882d256b5 Author: George Kadianakis Date: Sat Sep 15 16:33:05 2018 +0300 Add unittest for HiddenServiceExportCircuitID. Had to move a function to test helpers. --- src/core/or/or.h | 1 + src/test/test_extorport.c | 17 +-- src/test/test_helpers.c| 19 + src/test/test_helpers.h| 3 ++ src/test/test_hs_service.c | 70 ++ 5 files changed, 94 insertions(+), 16 deletions(-) diff --git a/src/core/or/or.h b/src/core/or/or.h index eae027012..efc124fa6 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -26,6 +26,7 @@ #include "lib/cc/compat_compiler.h" #include "lib/cc/torint.h" #include "lib/container/map.h" +#include "lib/container/buffers.h" #include "lib/container/smartlist.h" #include "lib/crypt_ops/crypto_cipher.h" #include "lib/crypt_ops/crypto_rsa.h" diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index ff987563c..7babc81ee 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -17,6 +17,7 @@ #include "core/or/or_connection_st.h" #include "test/test.h" +#include "test/test_helpers.h" #ifdef HAVE_SYS_STAT_H #include @@ -89,22 +90,6 @@ connection_write_to_buf_impl_replacement(const char *string, size_t len, buf_add(conn->outbuf, string, len); } -static char * -buf_get_contents(buf_t *buf, size_t *sz_out) -{ - char *out; - *sz_out = buf_datalen(buf); - if (*sz_out >= ULONG_MAX) -return NULL; /* C'mon, really? */ - out = tor_malloc(*sz_out + 1); - if (buf_get_bytes(buf, out, (unsigned long)*sz_out) != 0) { -tor_free(out); -return NULL; - } - out[*sz_out] = '\0'; /* Hopefully gratuitous. */ - return out; -} - static void test_ext_or_write_command(void *arg) { diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index c9138611d..a10821956 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -125,6 +125,25 @@ connection_write_to_buf_mock(const char *string, size_t len, buf_add(conn->outbuf, string, len); } +char * +buf_get_contents(buf_t *buf, size_t *sz_out) +{ + tor_assert(buf); + tor_assert(sz_out); + + char *out; + *sz_out = buf_datalen(buf); + if (*sz_out >= ULONG_MAX) +return NULL; /* C'mon, really? */ + out = tor_malloc(*sz_out + 1); + if (buf_get_bytes(buf, out, (unsigned long)*sz_out) != 0) { +tor_free(out); +return NULL; + } + out[*sz_out] = '\0'; /* Hopefully gratuitous. */ + return out; +} + /* Set up a fake origin circuit with the specified number of cells, * Return a pointer to the newly-created dummy circuit */ circuit_t * diff --git a/src/test/test_helpers.h b/src/test/test_helpers.h index 3196c93e6..72bf7f2f7 100644 --- a/src/test/test_helpers.h +++ b/src/test/test_helpers.h @@ -4,6 +4,8 @@ #ifndef TOR_TEST_HELPERS_H #define TOR_TEST_HELPERS_H +#define BUFFERS_PRIVATE + #include "core/or/or.h" const char *get_yesterday_date_str(void); @@ -18,6 +20,7 @@ void helper_setup_fake_routerlist(void); #define GET(path) "GET " path " HTTP/1.0\r\n\r\n" void connection_write_to_buf_mock(const char *string, size_t len, connection_t *conn, int compressed); +char *buf_get_contents(buf_t *buf, size_t *sz_out); int mock_tor_addr_lookup__fail_on_bad_addrs(const char *name, uint16_t family, tor_addr_t *out); diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index bceeafd14..0a1c866d6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -10,6 +10,7 @@ #define CIRCUITLIST_PRIVATE #define CONFIG_PRIVATE #define CONNECTION_PRIVATE +#define CONNECTION_EDGE_PRIVATE #define CRYPTO_PRIVATE #define HS_COMMON_PRIVATE #define HS_SERVICE_PRIVATE @@ -33,6 +34,9 @@ #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "core/or/edge_connection_st.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/fs/dir.h" #include "feature/dirauth/dirvote.h" @@ -2003,6 +2007,70 @@ test_authorized_client_config_equal(void *arg) tor_free(config2); } +/** Test that client circuit ID gets correctly exported */ +static void +test_export_client_circuit_id(void *arg) +{ + origin_circuit_t *or_circ = NULL; + size_t sz; + char *cp1=NULL, *cp2=NULL; + connection_t *conn = NULL; + + (void) arg; + + MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); + + hs_service_init(); + + /* Create service */ + hs_service_t *service = helper_create_service(); + /* Check that export circuit ID detection works */ + service->config.export_circuit_id = false; + tt_int_op(0, OP_EQ, +hs_service_exports_circuit_id(>keys.identity_pk)); + service->config.export_circuit_id = true; + tt_int_op(1, OP_EQ, +hs_service_exports_circuit_id(>keys.identity_pk)); + +
[tor-commits] [tor/master] Encode Circuit ID as src IP in Proxy Protocol for Opportunistic Onions
commit be142194cd447a5e31836128c9166f8a592a1649 Author: Mahrud Sayrafi Date: Mon Jul 30 16:10:23 2018 -0700 Encode Circuit ID as src IP in Proxy Protocol for Opportunistic Onions --- src/core/or/connection_edge.c | 23 +++ 1 file changed, 23 insertions(+) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index ab3c14d2c..a85419376 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -617,6 +617,29 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) rep_hist_note_exit_stream_opened(conn->port); conn->state = EXIT_CONN_STATE_OPEN; + + /* Include Proxy Protocol header. */ + char buf[512]; + char dst_ipv6[39] = "::1"; + /* See RFC4193 regarding fc00::/7 */ + char src_ipv6_prefix[34] = "fc00:dead:beef:4dad:"; + /* TODO: retain virtual port and use as destination port */ + uint16_t dst_port = 443; + uint16_t src_port = 0; + uint32_t gid = 0; + + if (edge_conn->on_circuit != NULL) { +gid = TO_ORIGIN_CIRCUIT(edge_conn->on_circuit)->global_identifier; +src_port = gid & 0x; + } + + gid = (gid == 0) ? 1 : gid; + src_port = (src_port == 0) ? 1 : src_port; + + tor_snprintf(buf, sizeof(buf), "PROXY TCP6 %s:%x %s %d %d\r\n", + src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); + connection_buf_add(buf, strlen(buf), conn); + connection_watch_events(conn, READ_EVENT); /* stop writing, keep reading */ if (connection_get_outbuf_len(conn)) /* in case there are any queued relay * cells */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'
commit 0e4c42a912d020888e811b748925362e1b3dc67b Merge: a1b028304 03ef4ec46 Author: Nick Mathewson Date: Fri Sep 21 09:40:16 2018 -0400 Merge remote-tracking branch 'ahf-github/asn/bugs4700_2' changes/bug4700 | 5 +++ doc/tor.1.txt | 27 src/app/config/config.c | 1 + src/core/or/connection_edge.c | 49 ++ src/core/or/connection_edge.h | 6 +++ src/core/or/or.h | 1 + src/feature/hs/hs_common.c| 5 +++ src/feature/hs/hs_config.c| 48 +- src/feature/hs/hs_ident.h | 4 ++ src/feature/hs/hs_service.c | 13 ++ src/feature/hs/hs_service.h | 15 +++ src/test/test_extorport.c | 17 +--- src/test/test_helpers.c | 19 + src/test/test_helpers.h | 3 ++ src/test/test_hs_service.c| 96 +++ 15 files changed, 292 insertions(+), 17 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 573cb1ec09e4045bdbdb7e6a0489013a9d99c2ab Author: Translation commit bot Date: Fri Sep 21 13:45:12 2018 + Update translations for bridgedb --- el/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 3f596687c..2f90b454d 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-09-21 10:03+\n" -"Last-Translator: A Papac \n" +"PO-Revision-Date: 2018-09-21 13:27+\n" +"Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -174,7 +174,7 @@ msgstr "%sÎ%sήÏη ÎεÏÏ ÏÏν" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[ÎÏ ÏÏ ÎµÎ¯Î½Î±Î¹ Îνα Î±Ï ÏομαÏοÏοιημενο Î¼Î®Î½Ï Î¼Î±. PαÏακαλοÏμε μην αÏανÏήÏεÏε!]" +msgstr "[ÎÏ ÏÏ ÎµÎ¯Î½Î±Î¹ Îνα Î±Ï ÏομαÏοÏοιημÎνο Î¼Î®Î½Ï Î¼Î±Â· ÏαÏÎ±ÎºÎ±Î»Ï Î¼Î·Î½ αÏανÏήÏεÏε.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
commit dbf5eb62a1daf1d9932372b14d75a941d3f2d2ed Author: Translation commit bot Date: Fri Sep 21 14:18:27 2018 + Update translations for torbutton-browseronboardingproperties_completed --- el/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/browserOnboarding.properties b/el/browserOnboarding.properties index e0a8e3454..c84ca3e91 100644 --- a/el/browserOnboarding.properties +++ b/el/browserOnboarding.properties @@ -5,7 +5,7 @@ onboarding.tour-tor-welcome=ÎαλÏÏ Î®Î»Î¸Î±Ïε onboarding.tour-tor-welcome.title=ÎίÏÏε ÎÏοιμοÏ. onboarding.tour-tor-welcome.description=Î ÏεÏιηγηÏÎ®Ï Tor ÏÏοÏÏÎÏει Ïα Ï ÏηλÏÏεÏα ÏÏάνÏÎ±Ï ÏÏην ιδιÏÏικÏÏηÏα και Ïην αÏÏάλεια καÏά Ïην ÏεÏιήγηÏη ÏÏο διαδίκÏÏ Î¿. Î¤Ï Ïα είÏÏε ÏÏοÏÏαÏÎµÏ Î¼ÎÎ½Î¿Ï Î±ÏÏ Ïον ενÏοÏιÏμÏ, Ïην καÏαÏκοÏία και Ïη λογοκÏιÏία. Îία γÏήγοÏη δοκιμή θα ÏÎ±Ï Î´ÎµÎ¯Î¾ÎµÎ¹ ÏÏÏ. -onboarding.tour-tor-welcome.button=ÎεκίνηÏεΤÏÏα +onboarding.tour-tor-welcome.button=ÎεκινήÏÏε ΤÏÏα onboarding.tour-tor-privacy=ÎδιÏÏικÏÏηÏα onboarding.tour-tor-privacy.title=ÎγνÏηÏÏε ενÏοÏιÏÏÎÏ ÎºÎ±Î¹ αδιάκÏιÏÎ¿Ï Ï. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit f45619ea98ba79acd8e79e059e16cde4bb882230 Author: Translation commit bot Date: Fri Sep 21 14:18:21 2018 + Update translations for torbutton-browseronboardingproperties --- el/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/browserOnboarding.properties b/el/browserOnboarding.properties index e0a8e3454..c84ca3e91 100644 --- a/el/browserOnboarding.properties +++ b/el/browserOnboarding.properties @@ -5,7 +5,7 @@ onboarding.tour-tor-welcome=ÎαλÏÏ Î®Î»Î¸Î±Ïε onboarding.tour-tor-welcome.title=ÎίÏÏε ÎÏοιμοÏ. onboarding.tour-tor-welcome.description=Î ÏεÏιηγηÏÎ®Ï Tor ÏÏοÏÏÎÏει Ïα Ï ÏηλÏÏεÏα ÏÏάνÏÎ±Ï ÏÏην ιδιÏÏικÏÏηÏα και Ïην αÏÏάλεια καÏά Ïην ÏεÏιήγηÏη ÏÏο διαδίκÏÏ Î¿. Î¤Ï Ïα είÏÏε ÏÏοÏÏαÏÎµÏ Î¼ÎÎ½Î¿Ï Î±ÏÏ Ïον ενÏοÏιÏμÏ, Ïην καÏαÏκοÏία και Ïη λογοκÏιÏία. Îία γÏήγοÏη δοκιμή θα ÏÎ±Ï Î´ÎµÎ¯Î¾ÎµÎ¹ ÏÏÏ. -onboarding.tour-tor-welcome.button=ÎεκίνηÏεΤÏÏα +onboarding.tour-tor-welcome.button=ÎεκινήÏÏε ΤÏÏα onboarding.tour-tor-privacy=ÎδιÏÏικÏÏηÏα onboarding.tour-tor-privacy.title=ÎγνÏηÏÏε ενÏοÏιÏÏÎÏ ÎºÎ±Î¹ αδιάκÏιÏÎ¿Ï Ï. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
commit c25e03254f8b74c805030b1d594056425fd315d2 Author: Translation commit bot Date: Fri Sep 21 13:17:59 2018 + Update translations for torbutton-torbuttondtd_completed --- el/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/torbutton.dtd b/el/torbutton.dtd index bdd484bf1..4d9456a93 100644 --- a/el/torbutton.dtd +++ b/el/torbutton.dtd @@ -2,11 +2,11 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
commit f9e5b4d3af7af2f2e58a73a42a045dac5d02724f Author: Translation commit bot Date: Fri Sep 21 13:17:41 2018 + Update translations for torbutton-branddtd_completed --- el/brand.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/brand.dtd b/el/brand.dtd index 0e3db6284..65bd74eba 100644 --- a/el/brand.dtd +++ b/el/brand.dtd @@ -9,7 +9,7 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] node: Make node_supports_v3_rendezvous_point() also check for the key
commit e3713f17fb393ef701f566dc3a34a188d270a908 Author: David Goulet Date: Thu Sep 20 08:50:27 2018 -0400 node: Make node_supports_v3_rendezvous_point() also check for the key It is not enough to look at protover for v3 rendezvous support but also we need to make sure that the curve25519 onion key is present or in other words that the descriptor has been fetched and does contain it. Fixes #27797. Signed-off-by: David Goulet --- changes/ticket27797 | 5 + src/feature/nodelist/nodelist.c | 5 + 2 files changed, 10 insertions(+) diff --git a/changes/ticket27797 b/changes/ticket27797 new file mode 100644 index 0..f07e35f84 --- /dev/null +++ b/changes/ticket27797 @@ -0,0 +1,5 @@ + o Minor bugfixes (node, hidden service v3): +- When selecting a v3 rendezvous point, not only look at the protover but + also if the curve25519 onion key is present. That way we avoid picking a + node that supports the v3 rendezvous but for which we don't have the + descriptor yet for the key. Fixes bug 27797; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 50dc8f7d3..24557a56f 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1141,6 +1141,11 @@ node_supports_v3_rendezvous_point(const node_t *node) { tor_assert(node); + /* We can't use a v3 rendezvous point without the curve25519 onion pk. */ + if (!node_get_curve25519_onion_key(node)) { +return 0; + } + return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket27797_035_01'
commit 96d1f2e6d0ebcb97aa66a1416d147533b24fac9c Merge: 55122bfe0 e3713f17f Author: Nick Mathewson Date: Fri Sep 21 09:33:03 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket27797_035_01' changes/ticket27797 | 5 + src/feature/nodelist/nodelist.c | 5 + 2 files changed, 10 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.4'
commit 9b0a17a74f5d8cd7c5d8a07dd275e7d96bd4fd35 Merge: 96d1f2e6d e818a7190 Author: Nick Mathewson Date: Fri Sep 21 09:36:31 2018 -0400 Merge branch 'maint-0.3.4' changes/bug27316 | 3 +++ src/core/or/protover.c | 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) diff --cc src/core/or/protover.c index 0f6f0e79f,0..f0791366f mode 100644,00..100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@@ -1,927 -1,0 +1,942 @@@ +/* Copyright (c) 2016-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file protover.c + * \brief Versioning information for different pieces of the Tor protocol. + * + * Starting in version 0.2.9.3-alpha, Tor places separate version numbers on + * each of the different components of its protocol. Relays use these numbers + * to advertise what versions of the protocols they can support, and clients + * use them to find what they can ask a given relay to do. Authorities vote + * on the supported protocol versions for each relay, and also vote on the + * which protocols you should have to support in order to be on the Tor + * network. All Tor instances use these required/recommended protocol versions + * to tell what level of support for recent protocols each relay has, and + * to decide whether they should be running given their current protocols. + * + * The main advantage of these protocol versions numbers over using Tor + * version numbers is that they allow different implementations of the Tor + * protocols to develop independently, without having to claim compatibility + * with specific versions of Tor. + **/ + +#define PROTOVER_PRIVATE + +#include "core/or/or.h" +#include "core/or/protover.h" +#include "feature/nodelist/routerparse.h" +#include "lib/tls/tortls.h" + +#ifndef HAVE_RUST + +static const smartlist_t *get_supported_protocol_list(void); +static int protocol_list_contains(const smartlist_t *protos, + protocol_type_t pr, uint32_t ver); + +/** Mapping between protocol type string and protocol type. */ +/// C_RUST_COUPLED: src/rust/protover/protover.rs `PROTOCOL_NAMES` +static const struct { + protocol_type_t protover_type; + const char *name; +} PROTOCOL_NAMES[] = { + { PRT_LINK, "Link" }, + { PRT_LINKAUTH, "LinkAuth" }, + { PRT_RELAY, "Relay" }, + { PRT_DIRCACHE, "DirCache" }, + { PRT_HSDIR, "HSDir" }, + { PRT_HSINTRO, "HSIntro" }, + { PRT_HSREND, "HSRend" }, + { PRT_DESC, "Desc" }, + { PRT_MICRODESC, "Microdesc"}, + { PRT_CONS, "Cons" } +}; + +#define N_PROTOCOL_NAMES ARRAY_LENGTH(PROTOCOL_NAMES) + +/* Maximum allowed length of any single subprotocol name. */ +// C_RUST_COUPLED: src/rust/protover/protover.rs +// `MAX_PROTOCOL_NAME_LENGTH` +static const unsigned MAX_PROTOCOL_NAME_LENGTH = 100; + +/** + * Given a protocol_type_t, return the corresponding string used in + * descriptors. + */ +STATIC const char * +protocol_type_to_str(protocol_type_t pr) +{ + unsigned i; + for (i=0; i < N_PROTOCOL_NAMES; ++i) { +if (PROTOCOL_NAMES[i].protover_type == pr) + return PROTOCOL_NAMES[i].name; + } + /* LCOV_EXCL_START */ + tor_assert_nonfatal_unreached_once(); + return "UNKNOWN"; + /* LCOV_EXCL_STOP */ +} + +/** + * Given a string, find the corresponding protocol type and store it in + * pr_out. Return 0 on success, -1 on failure. + */ +STATIC int +str_to_protocol_type(const char *s, protocol_type_t *pr_out) +{ + if (BUG(!pr_out)) +return -1; + + unsigned i; + for (i=0; i < N_PROTOCOL_NAMES; ++i) { +if (0 == strcmp(s, PROTOCOL_NAMES[i].name)) { + *pr_out = PROTOCOL_NAMES[i].protover_type; + return 0; +} + } + + return -1; +} + +/** + * Release all space held by a single proto_entry_t structure + */ +STATIC void +proto_entry_free_(proto_entry_t *entry) +{ + if (!entry) +return; + tor_free(entry->name); + SMARTLIST_FOREACH(entry->ranges, proto_range_t *, r, tor_free(r)); + smartlist_free(entry->ranges); + tor_free(entry); +} + +/** The largest possible protocol version. */ +#define MAX_PROTOCOL_VERSION (UINT32_MAX-1) + +/** + * Given a string s and optional end-of-string pointer + * end_of_range, parse the protocol range and store it in + * low_out and high_out. A protocol range has the format U, or + * U-U, where U is an unsigned 32-bit integer. + */ +static int +parse_version_range(const char *s, const char *end_of_range, +uint32_t *low_out, uint32_t *high_out) +{ + uint32_t low, high; + char *next = NULL; + int ok; + + tor_assert(high_out); + tor_assert(low_out); + + if (BUG(!end_of_range)) +end_of_range = s + strlen(s); // LCOV_EXCL_LINE + + /* A range must start with a digit. */ + if (!TOR_ISDIGIT(*s)) { +goto error; + } + + /* Note that this wouldn't be safe if we didn't
[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 2cadd93cea374664f151e945549b95f0b1f49b00 Merge: 75b95e1c8 5b04392c1 Author: Nick Mathewson Date: Fri Sep 21 09:35:51 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) diff --cc src/or/protover.c index 5145881ba,ebaca07ba..a63c2eb02 --- a/src/or/protover.c +++ b/src/or/protover.c @@@ -203,15 -206,10 +214,20 @@@ parse_single_entry(const char *s, cons if (equals == s) goto error; + /* The name must not be longer than MAX_PROTOCOL_NAME_LENGTH. */ + if (equals - s > (int)MAX_PROTOCOL_NAME_LENGTH) { +log_warn(LD_NET, "When parsing a protocol entry, I got a very large " + "protocol name. This is possibly an attack or a bug, unless " + "the Tor network truly supports protocol names larger than " + "%ud characters. The offending string was: %s", + MAX_PROTOCOL_NAME_LENGTH, escaped(out->name)); +goto error; + } ++ + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) + goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); @@@ -919,5 -791,3 +935,4 @@@ protover_free_all(void } } +#endif /* !defined(HAVE_RUST) */ - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit e818a7190599ff46184e1b8541b2317c145e6d8d Merge: 163230e24 2cadd93ce Author: Nick Mathewson Date: Fri Sep 21 09:35:54 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] protover: reject invalid protocol names
commit e24195c7c1aaecebaf5ef4f81b54da2f0db917c6 Author: cypherpunks Date: Sun Aug 26 01:20:44 2018 + protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha. --- changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) diff --git a/changes/bug27316 b/changes/bug27316 new file mode 100644 index 0..cec934891 --- /dev/null +++ b/changes/bug27316 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): +- Reject protocol names containing bytes other than alphanumeric characters + and hyphens ([A-Za-z0-9-]). Fixes bug 27316; bugfix on 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 31ca13fe6..2c5d5ab1f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -23,6 +23,7 @@ #define PROTOVER_PRIVATE +#include "compat.h" #include "or.h" #include "protover.h" #include "routerparse.h" @@ -170,6 +171,16 @@ parse_version_range(const char *s, const char *end_of_range, return -1; } +static int +is_valid_keyword(const char *s, size_t n) +{ + for (size_t i = 0; i < n; i++) { +if (!TOR_ISALNUM(s[i]) && s[i] != '-') + return 0; + } + return 1; +} + /** Parse a single protocol entry from s up to an optional * end_of_entry pointer, and return that protocol entry. Return NULL * on error. @@ -195,6 +206,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (equals == s) goto error; + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) +goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 92ead3ca3..c4379a15e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -283,6 +283,10 @@ test_protover_vote_roundtrip(void *args) const char *input; const char *expected_output; } examples[] = { +{ "Risqu\u00e9=1", NULL }, +{ ",,,=1", NULL }, +{ "\xc1=1", NULL }, +{ "Foo_Bar=1", NULL }, { "Fkrkljdsf", NULL }, { "Zn=4294967295", NULL }, { "Zn=4294967295-1", NULL }, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
commit e818a7190599ff46184e1b8541b2317c145e6d8d Merge: 163230e24 2cadd93ce Author: Nick Mathewson Date: Fri Sep 21 09:35:54 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 2cadd93cea374664f151e945549b95f0b1f49b00 Merge: 75b95e1c8 5b04392c1 Author: Nick Mathewson Date: Fri Sep 21 09:35:51 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) diff --cc src/or/protover.c index 5145881ba,ebaca07ba..a63c2eb02 --- a/src/or/protover.c +++ b/src/or/protover.c @@@ -203,15 -206,10 +214,20 @@@ parse_single_entry(const char *s, cons if (equals == s) goto error; + /* The name must not be longer than MAX_PROTOCOL_NAME_LENGTH. */ + if (equals - s > (int)MAX_PROTOCOL_NAME_LENGTH) { +log_warn(LD_NET, "When parsing a protocol entry, I got a very large " + "protocol name. This is possibly an attack or a bug, unless " + "the Tor network truly supports protocol names larger than " + "%ud characters. The offending string was: %s", + MAX_PROTOCOL_NAME_LENGTH, escaped(out->name)); +goto error; + } ++ + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) + goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); @@@ -919,5 -791,3 +935,4 @@@ protover_free_all(void } } +#endif /* !defined(HAVE_RUST) */ - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit bf2ffd39781664b6b29a57a1dd1d110368f120ce Merge: 04b5b8709 5b04392c1 Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 2cadd93cea374664f151e945549b95f0b1f49b00 Merge: 75b95e1c8 5b04392c1 Author: Nick Mathewson Date: Fri Sep 21 09:35:51 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) diff --cc src/or/protover.c index 5145881ba,ebaca07ba..a63c2eb02 --- a/src/or/protover.c +++ b/src/or/protover.c @@@ -203,15 -206,10 +214,20 @@@ parse_single_entry(const char *s, cons if (equals == s) goto error; + /* The name must not be longer than MAX_PROTOCOL_NAME_LENGTH. */ + if (equals - s > (int)MAX_PROTOCOL_NAME_LENGTH) { +log_warn(LD_NET, "When parsing a protocol entry, I got a very large " + "protocol name. This is possibly an attack or a bug, unless " + "the Tor network truly supports protocol names larger than " + "%ud characters. The offending string was: %s", + MAX_PROTOCOL_NAME_LENGTH, escaped(out->name)); +goto error; + } ++ + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) + goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); @@@ -919,5 -791,3 +935,4 @@@ protover_free_all(void } } +#endif /* !defined(HAVE_RUST) */ - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] protover: reject invalid protocol names
commit e24195c7c1aaecebaf5ef4f81b54da2f0db917c6 Author: cypherpunks Date: Sun Aug 26 01:20:44 2018 + protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha. --- changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) diff --git a/changes/bug27316 b/changes/bug27316 new file mode 100644 index 0..cec934891 --- /dev/null +++ b/changes/bug27316 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): +- Reject protocol names containing bytes other than alphanumeric characters + and hyphens ([A-Za-z0-9-]). Fixes bug 27316; bugfix on 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 31ca13fe6..2c5d5ab1f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -23,6 +23,7 @@ #define PROTOVER_PRIVATE +#include "compat.h" #include "or.h" #include "protover.h" #include "routerparse.h" @@ -170,6 +171,16 @@ parse_version_range(const char *s, const char *end_of_range, return -1; } +static int +is_valid_keyword(const char *s, size_t n) +{ + for (size_t i = 0; i < n; i++) { +if (!TOR_ISALNUM(s[i]) && s[i] != '-') + return 0; + } + return 1; +} + /** Parse a single protocol entry from s up to an optional * end_of_entry pointer, and return that protocol entry. Return NULL * on error. @@ -195,6 +206,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (equals == s) goto error; + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) +goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 92ead3ca3..c4379a15e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -283,6 +283,10 @@ test_protover_vote_roundtrip(void *args) const char *input; const char *expected_output; } examples[] = { +{ "Risqu\u00e9=1", NULL }, +{ ",,,=1", NULL }, +{ "\xc1=1", NULL }, +{ "Foo_Bar=1", NULL }, { "Fkrkljdsf", NULL }, { "Zn=4294967295", NULL }, { "Zn=4294967295-1", NULL }, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] protover: reject invalid protocol names
commit e24195c7c1aaecebaf5ef4f81b54da2f0db917c6 Author: cypherpunks Date: Sun Aug 26 01:20:44 2018 + protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha. --- changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) diff --git a/changes/bug27316 b/changes/bug27316 new file mode 100644 index 0..cec934891 --- /dev/null +++ b/changes/bug27316 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): +- Reject protocol names containing bytes other than alphanumeric characters + and hyphens ([A-Za-z0-9-]). Fixes bug 27316; bugfix on 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 31ca13fe6..2c5d5ab1f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -23,6 +23,7 @@ #define PROTOVER_PRIVATE +#include "compat.h" #include "or.h" #include "protover.h" #include "routerparse.h" @@ -170,6 +171,16 @@ parse_version_range(const char *s, const char *end_of_range, return -1; } +static int +is_valid_keyword(const char *s, size_t n) +{ + for (size_t i = 0; i < n; i++) { +if (!TOR_ISALNUM(s[i]) && s[i] != '-') + return 0; + } + return 1; +} + /** Parse a single protocol entry from s up to an optional * end_of_entry pointer, and return that protocol entry. Return NULL * on error. @@ -195,6 +206,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (equals == s) goto error; + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) +goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 92ead3ca3..c4379a15e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -283,6 +283,10 @@ test_protover_vote_roundtrip(void *args) const char *input; const char *expected_output; } examples[] = { +{ "Risqu\u00e9=1", NULL }, +{ ",,,=1", NULL }, +{ "\xc1=1", NULL }, +{ "Foo_Bar=1", NULL }, { "Fkrkljdsf", NULL }, { "Zn=4294967295", NULL }, { "Zn=4294967295-1", NULL }, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit e818a7190599ff46184e1b8541b2317c145e6d8d Merge: 163230e24 2cadd93ce Author: Nick Mathewson Date: Fri Sep 21 09:35:54 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
commit 0392c104f888e4ad0cda8c6b696905c3a548250a Merge: 9ba12d1a1 e24195c7c Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] protover: reject invalid protocol names
commit e24195c7c1aaecebaf5ef4f81b54da2f0db917c6 Author: cypherpunks Date: Sun Aug 26 01:20:44 2018 + protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha. --- changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) diff --git a/changes/bug27316 b/changes/bug27316 new file mode 100644 index 0..cec934891 --- /dev/null +++ b/changes/bug27316 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): +- Reject protocol names containing bytes other than alphanumeric characters + and hyphens ([A-Za-z0-9-]). Fixes bug 27316; bugfix on 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 31ca13fe6..2c5d5ab1f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -23,6 +23,7 @@ #define PROTOVER_PRIVATE +#include "compat.h" #include "or.h" #include "protover.h" #include "routerparse.h" @@ -170,6 +171,16 @@ parse_version_range(const char *s, const char *end_of_range, return -1; } +static int +is_valid_keyword(const char *s, size_t n) +{ + for (size_t i = 0; i < n; i++) { +if (!TOR_ISALNUM(s[i]) && s[i] != '-') + return 0; + } + return 1; +} + /** Parse a single protocol entry from s up to an optional * end_of_entry pointer, and return that protocol entry. Return NULL * on error. @@ -195,6 +206,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (equals == s) goto error; + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) +goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 92ead3ca3..c4379a15e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -283,6 +283,10 @@ test_protover_vote_roundtrip(void *args) const char *input; const char *expected_output; } examples[] = { +{ "Risqu\u00e9=1", NULL }, +{ ",,,=1", NULL }, +{ "\xc1=1", NULL }, +{ "Foo_Bar=1", NULL }, { "Fkrkljdsf", NULL }, { "Zn=4294967295", NULL }, { "Zn=4294967295-1", NULL }, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] protover: reject invalid protocol names
commit e24195c7c1aaecebaf5ef4f81b54da2f0db917c6 Author: cypherpunks Date: Sun Aug 26 01:20:44 2018 + protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha. --- changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) diff --git a/changes/bug27316 b/changes/bug27316 new file mode 100644 index 0..cec934891 --- /dev/null +++ b/changes/bug27316 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): +- Reject protocol names containing bytes other than alphanumeric characters + and hyphens ([A-Za-z0-9-]). Fixes bug 27316; bugfix on 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 31ca13fe6..2c5d5ab1f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -23,6 +23,7 @@ #define PROTOVER_PRIVATE +#include "compat.h" #include "or.h" #include "protover.h" #include "routerparse.h" @@ -170,6 +171,16 @@ parse_version_range(const char *s, const char *end_of_range, return -1; } +static int +is_valid_keyword(const char *s, size_t n) +{ + for (size_t i = 0; i < n; i++) { +if (!TOR_ISALNUM(s[i]) && s[i] != '-') + return 0; + } + return 1; +} + /** Parse a single protocol entry from s up to an optional * end_of_entry pointer, and return that protocol entry. Return NULL * on error. @@ -195,6 +206,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (equals == s) goto error; + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) +goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 92ead3ca3..c4379a15e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -283,6 +283,10 @@ test_protover_vote_roundtrip(void *args) const char *input; const char *expected_output; } examples[] = { +{ "Risqu\u00e9=1", NULL }, +{ ",,,=1", NULL }, +{ "\xc1=1", NULL }, +{ "Foo_Bar=1", NULL }, { "Fkrkljdsf", NULL }, { "Zn=4294967295", NULL }, { "Zn=4294967295-1", NULL }, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
commit 08aaedb0151684c31ace7ecabc9184b7cc018352 Merge: 4149b1554 e818a7190 Author: Nick Mathewson Date: Fri Sep 21 09:35:54 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit 396b9491119e4838388ac0aee8e20d87c0b74125 Merge: f466548e0 2cadd93ce Author: Nick Mathewson Date: Fri Sep 21 09:35:54 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c | 4 3 files changed, 23 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] protover: reject invalid protocol names
commit e24195c7c1aaecebaf5ef4f81b54da2f0db917c6 Author: cypherpunks Date: Sun Aug 26 01:20:44 2018 + protover: reject invalid protocol names The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha. --- changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) diff --git a/changes/bug27316 b/changes/bug27316 new file mode 100644 index 0..cec934891 --- /dev/null +++ b/changes/bug27316 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover): +- Reject protocol names containing bytes other than alphanumeric characters + and hyphens ([A-Za-z0-9-]). Fixes bug 27316; bugfix on 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 31ca13fe6..2c5d5ab1f 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -23,6 +23,7 @@ #define PROTOVER_PRIVATE +#include "compat.h" #include "or.h" #include "protover.h" #include "routerparse.h" @@ -170,6 +171,16 @@ parse_version_range(const char *s, const char *end_of_range, return -1; } +static int +is_valid_keyword(const char *s, size_t n) +{ + for (size_t i = 0; i < n; i++) { +if (!TOR_ISALNUM(s[i]) && s[i] != '-') + return 0; + } + return 1; +} + /** Parse a single protocol entry from s up to an optional * end_of_entry pointer, and return that protocol entry. Return NULL * on error. @@ -195,6 +206,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (equals == s) goto error; + /* The name must contain only alphanumeric characters and hyphens. */ + if (!is_valid_keyword(s, equals-s)) +goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 92ead3ca3..c4379a15e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -283,6 +283,10 @@ test_protover_vote_roundtrip(void *args) const char *input; const char *expected_output; } examples[] = { +{ "Risqu\u00e9=1", NULL }, +{ ",,,=1", NULL }, +{ "\xc1=1", NULL }, +{ "Foo_Bar=1", NULL }, { "Fkrkljdsf", NULL }, { "Zn=4294967295", NULL }, { "Zn=4294967295-1", NULL }, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed
commit 21207b98b5c286b9229d5d751edee5209265c2f8 Author: Translation commit bot Date: Fri Sep 21 13:47:03 2018 + Update translations for tor-and-https_completed --- el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el.po b/el.po index db71967bb..6786628f4 100644 --- a/el.po +++ b/el.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+\n" -"PO-Revision-Date: 2018-04-12 19:08+\n" -"Last-Translator: LaScapigliata \n" +"PO-Revision-Date: 2018-09-21 13:24+\n" +"Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-and-https] Update translations for tor-and-https
commit b8bb37f72b63536e4738e6b7e91ff14272b5e4bc Author: Translation commit bot Date: Fri Sep 21 13:46:58 2018 + Update translations for tor-and-https --- el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el.po b/el.po index db71967bb..6786628f4 100644 --- a/el.po +++ b/el.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+\n" -"PO-Revision-Date: 2018-04-12 19:08+\n" -"Last-Translator: LaScapigliata \n" +"PO-Revision-Date: 2018-09-21 13:24+\n" +"Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 9d45e8d6ac9a2c81405bb1adf424b184488912cb Author: Translation commit bot Date: Fri Sep 21 14:15:28 2018 + Update translations for https_everywhere --- ga/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ga/https-everywhere.dtd b/ga/https-everywhere.dtd index 9ca966342..8ae0cec26 100644 --- a/ga/https-everywhere.dtd +++ b/ga/https-everywhere.dtd @@ -18,7 +18,7 @@ - + @@ -39,8 +39,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits