[tor-commits] [tor-browser-build/master] Bug 24477: Fix generation of Windows 64 mar files
commit 0abccfe4258218612f38ac1c2d762c319781386f
Author: Nicolas Vigier
Date: Fri Dec 1 00:48:20 2017 +0100
Bug 24477: Fix generation of Windows 64 mar files
---
projects/tor-browser/build | 5 +
projects/tor-browser/config | 6 ++
2 files changed, 11 insertions(+)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 022d6e9..56d6294 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -43,6 +43,11 @@ mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions
# Extract the MAR tools.
unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox')
%]/mar-tools-*.zip
MARTOOLS=$rootdir/mar-tools
+[% IF c("var/windows-x86_64") -%]
+ # Workaround for bug 24477
+ rm -Rf $MARTOOLS
+ unzip -d $rootdir $rootdir/mar-tools-linux32.zip
+[% END -%]
mv [% c('input_files_by_name/tor-launcher') %]
$TBDIR/$EXTSPATH/tor-launc...@torproject.org.xpi
mv [% c('input_files_by_name/torbutton') %]
$TBDIR/$EXTSPATH/torbut...@torproject.org.xpi
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index c00af05..eb0a5d0 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -85,3 +85,9 @@ input_files:
enable: '[% c("var/windows") %]'
- filename: pe_checksum_fix.py
enable: '[% c("var/windows") %]'
+ # Workaround for bug 24477
+ - URL:
https://archive.torproject.org/tor-package-archive/torbrowser/7.5a7/mar-tools-linux32.zip
+sig_ext: asc
+file_gpg_id: 1
+gpg_keyring: torbrowser.gpg
+enable: '[% c("var/windows-x86_64") %]'
___
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 1f305daec221a3a43a915c051f80d66df2ae4ea3 Author: Translation commit bot Date: Fri Dec 1 10:15:40 2017 + Update translations for https_everywhere --- ms_MY/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ms_MY/ssl-observatory.dtd b/ms_MY/ssl-observatory.dtd index c0aac2a0d..01262b1e6 100644 --- a/ms_MY/ssl-observatory.dtd +++ b/ms_MY/ssl-observatory.dtd @@ -47,10 +47,10 @@ root CA yang tidak standard"> "Ini akan capai dan hantar "Autonomous System number" rangkaian anda. Ia akan membantu mengesan serangan terhadap HTTPS, dan untuk menentukan samada terdapat pemantauan dari rangkaian seperti Iran dan Syria di mana serangan sering berlaku."> +"Tunjuk amaran ketika Observatory mengesan sijil terbatal yang tidak dikesan oleh pelayar anda"> +"Ia akan memeriksa sijil yang diserahkan melalui Senarai Pembatalan Sijil. Malangnya kami tidak dapat memberi jaminan kami menanda setiap sijil yang terbatal, tetapi jika anda mendapati ada amaran maka berkemungkinan ada masalah berlaku."> @@ -97,7 +97,7 @@ untuk butiran lanjut:"> - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy] Update translations for torbirdy
commit 06e79bf77c4117fad57fd3ef3e7fc515e3302496 Author: Translation commit bot Date: Fri Dec 1 10:16:20 2017 + Update translations for torbirdy --- ms_MY/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/torbirdy.properties b/ms_MY/torbirdy.properties index 4af8e5820..e83676793 100644 --- a/ms_MY/torbirdy.properties +++ b/ms_MY/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy Diaktifkan: Custom Proksi torbirdy.enabled.torification=TorBirdy Diaktifkan: Transparent Torification torbirdy.enabled.whonix=TorBirdy diaktifkan: Whonix torbirdy.disabled=TorBirdy: Disabled! -torbirdy.enabled=TorBirdy:Enabled +torbirdy.enabled=TorBirdy:Dibenarkan torbirdy.email.prompt=TorBirdy telah menyahaktifkan auto tetapan Thunderbird untuk melindungi privasi anda.\n\nTetapan sekuriti yang disyorkan untuk %S telah ditetapkan.\n\nAnda sekarang boleh mengkonfigurasi tetapan akaun lain secara manual. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed
commit c78f1925df9649a4dddad3ada02bea17aeeaeeeb Author: Translation commit bot Date: Fri Dec 1 10:16:29 2017 + Update translations for torbirdy_completed --- ms_MY/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ms_MY/torbirdy.properties b/ms_MY/torbirdy.properties index 0719fd6e3..e83676793 100644 --- a/ms_MY/torbirdy.properties +++ b/ms_MY/torbirdy.properties @@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy Diaktifkan: Custom Proksi torbirdy.enabled.torification=TorBirdy Diaktifkan: Transparent Torification torbirdy.enabled.whonix=TorBirdy diaktifkan: Whonix torbirdy.disabled=TorBirdy: Disabled! +torbirdy.enabled=TorBirdy:Dibenarkan torbirdy.email.prompt=TorBirdy telah menyahaktifkan auto tetapan Thunderbird untuk melindungi privasi anda.\n\nTetapan sekuriti yang disyorkan untuk %S telah ditetapkan.\n\nAnda sekarang boleh mengkonfigurasi tetapan akaun lain secara manual. ___ 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 32196923aa64781c783e777ede0dd6bb2cc1a7fd Author: Translation commit bot Date: Fri Dec 1 10:15:51 2017 + Update translations for https_everywhere_completed --- ms_MY/ssl-observatory.dtd | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ms_MY/ssl-observatory.dtd b/ms_MY/ssl-observatory.dtd index 2f69f3b4a..01262b1e6 100644 --- a/ms_MY/ssl-observatory.dtd +++ b/ms_MY/ssl-observatory.dtd @@ -46,6 +46,12 @@ root CA yang tidak standard"> + + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-progress] Update translations for tor-launcher-progress
commit 0e8c100764315d5641bd54b2d9f70e9a805ee437 Author: Translation commit bot Date: Fri Dec 1 10:16:54 2017 + Update translations for tor-launcher-progress --- ms_MY/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/progress.dtd b/ms_MY/progress.dtd index 1735116a9..f9ddc181d 100644 --- a/ms_MY/progress.dtd +++ b/ms_MY/progress.dtd @@ -1,4 +1,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
commit 82b34a4afbfdeb4425f0c6788c26d928db01784b Author: Translation commit bot Date: Fri Dec 1 10:17:00 2017 + Update translations for tor-launcher-progress_completed --- ms_MY/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/progress.dtd b/ms_MY/progress.dtd index f24ab09d7..f9ddc181d 100644 --- a/ms_MY/progress.dtd +++ b/ms_MY/progress.dtd @@ -1,4 +1,4 @@ - + ___ 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 dc939b8fec13c0185a65ec138d19d40a46901dfa Author: Translation commit bot Date: Fri Dec 1 10:17:27 2017 + Update translations for abouttor-homepage --- ms_MY/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ms_MY/aboutTor.dtd b/ms_MY/aboutTor.dtd index 9c76588ba..e6a763e12 100644 --- a/ms_MY/aboutTor.dtd +++ b/ms_MY/aboutTor.dtd @@ -6,9 +6,9 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit 17781919e62d902683c1c3c88ed1bc022a4c4c54 Author: Translation commit bot Date: Fri Dec 1 10:17:06 2017 + Update translations for tor-launcher-network-settings --- ms_MY/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/network-settings.dtd b/ms_MY/network-settings.dtd index f047e2797..93f4374b4 100644 --- a/ms_MY/network-settings.dtd +++ b/ms_MY/network-settings.dtd @@ -55,4 +55,4 @@ - + ___ 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 14a5e57d50dc7792f83ab79ef91dbf8134e3be8e Author: Translation commit bot Date: Fri Dec 1 10:17:46 2017 + Update translations for torbutton-branddtd --- ms_MY/brand.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ms_MY/brand.dtd b/ms_MY/brand.dtd index 9e2362c1e..f67cc6628 100644 --- a/ms_MY/brand.dtd +++ b/ms_MY/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-branddtd_completed] Update translations for torbutton-branddtd_completed
commit c29d2e08d13d4e1d7de3a7da7237bc8d0509344b Author: Translation commit bot Date: Fri Dec 1 10:17:52 2017 + Update translations for torbutton-branddtd_completed --- ms_MY/brand.dtd | 7 +++ 1 file changed, 7 insertions(+) diff --git a/ms_MY/brand.dtd b/ms_MY/brand.dtd index ec61aaa19..f67cc6628 100644 --- a/ms_MY/brand.dtd +++ b/ms_MY/brand.dtd @@ -2,7 +2,14 @@ - 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/. --> + + + + + + + ___ 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 46a9b819ef46375adc26c33c79344b81b5ca0bab Author: Translation commit bot Date: Fri Dec 1 10:18:25 2017 + Update translations for tor-and-https --- ms_MY.po | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ms_MY.po b/ms_MY.po index 504f46d4e..e9be8e908 100644 --- a/ms_MY.po +++ b/ms_MY.po @@ -1,12 +1,13 @@ # # Translators: +# abuyop , 2017 # kz_gtr , 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+\n" -"PO-Revision-Date: 2017-09-20 03:03+\n" -"Last-Translator: kz_gtr \n" +"PO-Revision-Date: 2017-12-01 10:08+\n" +"Last-Translator: abuyop \n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgstr "Peguam" #: C/tor-and-https.svg:363 #, no-wrap msgid "Sysadmin" -msgstr "" +msgstr "Sysadmin" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. @@ -109,7 +110,7 @@ msgstr "NSA" #: C/tor-and-https.svg:363 #, no-wrap msgid "Tor relay" -msgstr "" +msgstr "Gantian Tor" #. (itstool) path: defs/text #: C/tor-and-https.svg:363 @@ -127,10 +128,10 @@ msgstr "Sambungan internet" #: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" -msgstr "" +msgstr "Mencuri dengar" #. (itstool) path: defs/text #: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" -msgstr "" +msgstr "Perkongsian data" ___ 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 84ba28947ef8d658ae585258293427b8acd6f39e Author: Translation commit bot Date: Fri Dec 1 10:18:31 2017 + Update translations for tor-and-https_completed --- ms_MY.po | 137 +++ 1 file changed, 137 insertions(+) diff --git a/ms_MY.po b/ms_MY.po new file mode 100644 index 0..e9be8e908 --- /dev/null +++ b/ms_MY.po @@ -0,0 +1,137 @@ +# +# Translators: +# abuyop , 2017 +# kz_gtr , 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2014-07-17 14:23+\n" +"PO-Revision-Date: 2017-12-01 10:08+\n" +"Last-Translator: abuyop \n" +"Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ms_MY\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. (itstool) path: C/tor-and-https.svg/svg@direction +#. (itstool) comment: C/tor-and-https.svg/svg@direction +#. Specify "ltr" for left-to-right languages or "rtl" for right-to-left +#. languages (e.g. Arabic or Hebrew). +#: C/tor-and-https.svg:3 +msgid "ltr" +msgstr "ltr" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 +#, no-wrap +msgid "Tor and HTTPS" +msgstr "Tor dan HTTPS" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Site.com" +msgstr "Site.com" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "user / pw" +msgstr "pengguna / pw" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "data" +msgstr "data" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "location" +msgstr "lokasi" + +#. (itstool) path: defs/text +#. Keep it short: 3em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "WiFi" +msgstr "WiFi" + +#. (itstool) path: defs/text +#. Keep it short: 4em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "ISP" +msgstr "ISP" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Hacker" +msgstr "Hacker" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Lawyer" +msgstr "Peguam" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Sysadmin" +msgstr "Sysadmin" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Police" +msgstr "Polis" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "NSA" +msgstr "NSA" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Tor relay" +msgstr "Gantian Tor" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Key" +msgstr "Kunci" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Internet connection" +msgstr "Sambungan internet" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Eavesdropping" +msgstr "Mencuri dengar" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Data sharing" +msgstr "Perkongsian data" ___ 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 0f80af2cf1edc2c5f3b837ac5a975bacf0a52516 Author: Translation commit bot Date: Fri Dec 1 10:19:14 2017 + Update translations for torbutton-abouttbupdatedtd --- ms_MY/abouttbupdate.dtd | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ms_MY/abouttbupdate.dtd b/ms_MY/abouttbupdate.dtd index 37567bd7e..b9e2c1127 100644 --- a/ms_MY/abouttbupdate.dtd +++ b/ms_MY/abouttbupdate.dtd @@ -1,6 +1,6 @@ - - - - + + + + - + ___ 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 c526981460dd4d18c0b80a8cdde2476b9404b43d Author: Translation commit bot Date: Fri Dec 1 10:19:19 2017 + Update translations for torbutton-abouttbupdatedtd_completed --- ms_MY/abouttbupdate.dtd | 6 ++ 1 file changed, 6 insertions(+) diff --git a/ms_MY/abouttbupdate.dtd b/ms_MY/abouttbupdate.dtd new file mode 100644 index 0..b9e2c1127 --- /dev/null +++ b/ms_MY/abouttbupdate.dtd @@ -0,0 +1,6 @@ + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit 0669b6ddc7829ec0e0a0bee5af49c36c0994443e Author: Translation commit bot Date: Fri Dec 1 10:18:55 2017 + Update translations for torbutton-abouttorproperties --- ms_MY/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/abouttor.properties b/ms_MY/abouttor.properties index d0d3a64b8..ea46c07e5 100644 --- a/ms_MY/abouttor.properties +++ b/ms_MY/abouttor.properties @@ -2,7 +2,7 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchDDG.privacy=Search securely with DuckDuckGo. +aboutTor.searchDDG.privacy=Gelintar secara selamat dengan DuckDuckGo. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
commit f75ce821164ad77e9427d4ae604fd111d1d0e044 Author: Translation commit bot Date: Fri Dec 1 10:19:34 2017 + Update translations for tor-messenger-authdtd --- ms_MY/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/auth.dtd b/ms_MY/auth.dtd index 6bc675dd7..d77fbcb20 100644 --- a/ms_MY/auth.dtd +++ b/ms_MY/auth.dtd @@ -17,5 +17,5 @@ - + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
commit dc578beaa16909b6537116aa1b95c4e4656aa703 Author: Translation commit bot Date: Fri Dec 1 10:20:22 2017 + Update translations for tor-messenger-privdtd --- ms_MY/priv.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/priv.dtd b/ms_MY/priv.dtd index 741dfba95..ff1e5249f 100644 --- a/ms_MY/priv.dtd +++ b/ms_MY/priv.dtd @@ -1,2 +1,2 @@ - + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties
commit cadd4ccedadcaae8d995d6acc6ccc7c6ed196d52 Author: Translation commit bot Date: Fri Dec 1 10:19:50 2017 + Update translations for tor-messenger-authproperties --- ms_MY/auth.properties | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ms_MY/auth.properties b/ms_MY/auth.properties index 1b8d869e5..bdf4a410f 100644 --- a/ms_MY/auth.properties +++ b/ms_MY/auth.properties @@ -1,7 +1,7 @@ auth.title=Mengesahkan identiti %S -auth.yourFingerprint=Fingerprint for you, %S:\n%S -auth.theirFingerprint=Purported fingerprint for %S:\n%S -auth.help=Verifying a contact's identity helps ensure that the person you are talking to is who they claim to be. -auth.helpTitle=Verification help -auth.question=This is the question asked by your contact:\n\n%S\n\nEnter secret answer here (case sensitive): -auth.secret=Enter secret here: +auth.yourFingerprint=Cap jari untuk anda, %S:\n%S +auth.theirFingerprint=Cap jari bertujuan untuk %S:\n%S +auth.help=Pengesahan identiti kenalan dapat memastikan individu yang anda hubungi adalah benar-benar dirinya. +auth.helpTitle=Bantuan pengesahan +auth.question=Soalan ini ditanya oleh kenalan anda:\n\n%S\n\nMasukkan jawapan rahsia di sini (sensitif kata): +auth.secret=Masukkan rahsia di sini: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed
commit 63928f05ba8c2c4ea51127c80fdcb986f12fd197 Author: Translation commit bot Date: Fri Dec 1 10:20:28 2017 + Update translations for tor-messenger-privdtd_completed --- ms_MY/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ms_MY/priv.dtd b/ms_MY/priv.dtd new file mode 100644 index 0..ff1e5249f --- /dev/null +++ b/ms_MY/priv.dtd @@ -0,0 +1,2 @@ + + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-privproperties] Update translations for tor-messenger-privproperties
commit 8f4a6f347ec9c74021daab2ad12fb94bb063cd45 Author: Translation commit bot Date: Fri Dec 1 10:20:33 2017 + Update translations for tor-messenger-privproperties --- ms_MY/priv.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ms_MY/priv.properties b/ms_MY/priv.properties index f8a9f15da..3432f8659 100644 --- a/ms_MY/priv.properties +++ b/ms_MY/priv.properties @@ -1,2 +1,2 @@ -priv.account=Generating private key for %S (%S) ... -priv.failed=Generating key failed: %S +priv.account=Menjana kunci persendirian untuk %S (%S) ... +priv.failed=Penjanaan kunci gagal: %S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-authproperties_completed] Update translations for tor-messenger-authproperties_completed
commit 50727d2deacfbacec1f75f88ca92496f89c0be40 Author: Translation commit bot Date: Fri Dec 1 10:19:44 2017 + Update translations for tor-messenger-authproperties_completed --- ms_MY/auth.properties | 7 +++ 1 file changed, 7 insertions(+) diff --git a/ms_MY/auth.properties b/ms_MY/auth.properties new file mode 100644 index 0..bdf4a410f --- /dev/null +++ b/ms_MY/auth.properties @@ -0,0 +1,7 @@ +auth.title=Mengesahkan identiti %S +auth.yourFingerprint=Cap jari untuk anda, %S:\n%S +auth.theirFingerprint=Cap jari bertujuan untuk %S:\n%S +auth.help=Pengesahan identiti kenalan dapat memastikan individu yang anda hubungi adalah benar-benar dirinya. +auth.helpTitle=Bantuan pengesahan +auth.question=Soalan ini ditanya oleh kenalan anda:\n\n%S\n\nMasukkan jawapan rahsia di sini (sensitif kata): +auth.secret=Masukkan rahsia di sini: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
commit 61893537387c924963c3212671fdf298958fb69e Author: Translation commit bot Date: Fri Dec 1 10:20:39 2017 + Update translations for tor-messenger-privproperties_completed --- ms_MY/priv.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ms_MY/priv.properties b/ms_MY/priv.properties new file mode 100644 index 0..3432f8659 --- /dev/null +++ b/ms_MY/priv.properties @@ -0,0 +1,2 @@ +priv.account=Menjana kunci persendirian untuk %S (%S) ... +priv.failed=Penjanaan kunci gagal: %S ___ 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 c12c44ddf7813afc9c2e1ab8a3e20f1d018edfe3 Author: Translation commit bot Date: Fri Dec 1 10:24:30 2017 + Update translations for tor-browser-manual --- ms_MY/ms_MY.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po index b99ef7d8b..efc02614b 100644 --- a/ms_MY/ms_MY.po +++ b/ms_MY/ms_MY.po @@ -2,12 +2,13 @@ # Mohd Shahril Bin Zainol Abidin , 2016 # adnanshukor , 2016 # Weldan Jamili , 2016 +# abuyop , 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Weldan Jamili , 2016\n" +"Last-Translator: abuyop , 2017\n" "Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -493,7 +494,7 @@ msgstr "" #: index.page:6 msgid "Tor Browser User Manual" -msgstr "" +msgstr "Panduan Pengguna Pelayar Tor" #: known-issues.page:6 msgid "A list of known issues." ___ 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 a4047a7c6e7dff2c14ec0b2e44fa1c4dbf2b4578 Author: Translation commit bot Date: Fri Dec 1 10:47:21 2017 + Update translations for abouttor-homepage_completed --- ms_MY/aboutTor.dtd | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/ms_MY/aboutTor.dtd b/ms_MY/aboutTor.dtd index 6d7c3e9d7..71a1a1105 100644 --- a/ms_MY/aboutTor.dtd +++ b/ms_MY/aboutTor.dtd @@ -1,30 +1,25 @@ - + - + - - + + - - - - -https://startpage.com/rth/search";> -https://duckduckgo.com/html/";> +https://duckduckgo.com";> @@ -34,6 +29,8 @@ https://www.torproject.org/download/download.html.en#warning";> + + ___ 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.1] Handle NULL input to protover_compute_for_old_tor()
commit 2c0487ecfb410d1361b114e60d8e9ffd2ed092ec
Author: Nick Mathewson
Date: Sat Nov 11 13:56:35 2017 -0500
Handle NULL input to protover_compute_for_old_tor()
Fixes bug 24245; bugfix on 0.2.9.4-alpha. TROVE-2017-010.
---
changes/trove-2017-010 | 6 ++
src/or/protover.c | 5 +
2 files changed, 11 insertions(+)
diff --git a/changes/trove-2017-010 b/changes/trove-2017-010
new file mode 100644
index 0..d5bf9333d
--- /dev/null
+++ b/changes/trove-2017-010
@@ -0,0 +1,6 @@
+ o Major bugfixes (security):
+- Fix a denial-of-service issue where an attacker could crash
+ a directory authority using a malformed router descriptor.
+ Fixes bug 24245; bugfix on 0.2.9.4-alpha. Also tracked
+ as TROVE-2017-010 and CVE-2017-8820.
+
diff --git a/src/or/protover.c b/src/or/protover.c
index 0a4d4fb8f..98957cabd 100644
--- a/src/or/protover.c
+++ b/src/or/protover.c
@@ -694,6 +694,11 @@ protocol_list_contains(const smartlist_t *protos,
const char *
protover_compute_for_old_tor(const char *version)
{
+ if (version == NULL) {
+/* No known version; guess the oldest series that is still supported. */
+version = "0.2.5.15";
+ }
+
if (tor_version_as_new_as(version,
FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS)) {
return "";
___
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.1] Merge branch 'trove-2017-012_030' into maint-0.3.0
commit d459c08b7d5cb1766bda5443ea2750bca160212d Merge: 766d0a2d9 91cee3c9e Author: Nick Mathewson Date: Thu Nov 30 12:07:43 2017 -0500 Merge branch 'trove-2017-012_030' into maint-0.3.0 changes/trove-2017-012-part2 | 5 + src/or/entrynodes.c | 3 ++- 2 files changed, 7 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.1] Fix length of replaycache-checked data.
commit 2834cc9c18230c36278ffa94a252abeb91b6cff9
Author: Nick Mathewson
Date: Sat Nov 11 13:40:21 2017 -0500
Fix length of replaycache-checked data.
This is a regression; we should have been checking only the
public-key encrypted portion. Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.
---
changes/trove-2017-009 | 10 ++
src/or/rendservice.c | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/changes/trove-2017-009 b/changes/trove-2017-009
new file mode 100644
index 0..512d18c29
--- /dev/null
+++ b/changes/trove-2017-009
@@ -0,0 +1,10 @@
+ o Major fixes (security):
+- When checking for replays in the INTRODUCE1 cell data for a (legacy)
+ hiddden service, correctly detect replays in the RSA-encrypted part of
+ the cell. We were previously checking for replays on the entire cell,
+ but those can be circumvented due to the malleability of Tor's legacy
+ hybrid encryption. This fix helps prevent a traffic confirmation
+ attack. Fixes bug 24244; bugfix on 0.2.4.1-alpha. This issue is also
+ tracked as TROVE-2017-009 and CVE-2017-8819.
+
+
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d958de9df..ba8891ead 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1162,6 +1162,7 @@ rend_service_introduce(origin_circuit_t *circuit, const
uint8_t *request,
time_t now = time(NULL);
time_t elapsed;
int replay;
+ size_t keylen;
/* Do some initial validation and logging before we parse the cell */
if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) {
@@ -1245,9 +1246,10 @@ rend_service_introduce(origin_circuit_t *circuit, const
uint8_t *request,
}
/* check for replay of PK-encrypted portion. */
+ keylen = crypto_pk_keysize(intro_key);
replay = replaycache_add_test_and_elapsed(
intro_point->accepted_intro_rsa_parts,
-parsed_req->ciphertext, parsed_req->ciphertext_len,
+parsed_req->ciphertext, MIN(parsed_req->ciphertext_len, keylen),
&elapsed);
if (replay) {
___
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.1] Avoid asking for passphrase on junky PEM input
commit 1880a6a88e240556a8e6b169f1160aa8220ab0ec
Author: Nick Mathewson
Date: Sat Nov 11 14:21:37 2017 -0500
Avoid asking for passphrase on junky PEM input
Fixes bug 24246 and TROVE-2017-011.
This bug is so old, it's in Matej's code. Seems to have been
introduced with e01522bbed6eea.
---
changes/trove-2017-011 | 8
src/common/crypto.c| 16 +---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/changes/trove-2017-011 b/changes/trove-2017-011
new file mode 100644
index 0..82d20d9e7
--- /dev/null
+++ b/changes/trove-2017-011
@@ -0,0 +1,8 @@
+ o Major bugfixes (security):
+- Fix a denial of service bug where an attacker could use a malformed
+ directory object to cause a Tor instance to pause while OpenSSL would
+ try to read a passphrase from the terminal. (If the terminal was not
+ available, tor would continue running.) Fixes bug 24246; bugfix on
+ every version of Tor. Also tracked as TROVE-2017-011 and
+ CVE-2017-8821. Found by OSS-Fuzz as testcase 6360145429790720.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index f7362765d..8d816652d 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -592,11 +592,21 @@ crypto_pk_generate_key_with_bits(crypto_pk_t *env, int
bits)
return 0;
}
+/** A PEM callback that always reports a failure to get a password */
+static int
+pem_no_password_cb(char *buf, int size, int rwflag, void *u)
+{
+ (void)buf;
+ (void)size;
+ (void)rwflag;
+ (void)u;
+ return 0;
+}
+
/** Read a PEM-encoded private key from the len-byte string s
* into env. Return 0 on success, -1 on failure. If len is -1,
* the string is nul-terminated.
*/
-/* Used here, and used for testing. */
int
crypto_pk_read_private_key_from_string(crypto_pk_t *env,
const char *s, ssize_t len)
@@ -615,7 +625,7 @@ crypto_pk_read_private_key_from_string(crypto_pk_t *env,
if (env->key)
RSA_free(env->key);
- env->key = PEM_read_bio_RSAPrivateKey(b,NULL,NULL,NULL);
+ env->key = PEM_read_bio_RSAPrivateKey(b,NULL,pem_no_password_cb,NULL);
BIO_free(b);
@@ -747,7 +757,7 @@ crypto_pk_read_public_key_from_string(crypto_pk_t *env,
const char *src,
if (env->key)
RSA_free(env->key);
- env->key = PEM_read_bio_RSAPublicKey(b, NULL, NULL, NULL);
+ env->key = PEM_read_bio_RSAPublicKey(b, NULL, pem_no_password_cb, NULL);
BIO_free(b);
if (!env->key) {
crypto_log_errors(LOG_WARN, "reading public key from string");
___
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.1] Fix changes file
commit 75509dc82778a3bb866dca0fa86ae3e179ad78fa Author: Nick Mathewson Date: Thu Nov 30 11:52:40 2017 -0500 Fix changes file --- changes/trove-2017-009 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/trove-2017-009 b/changes/trove-2017-009 index 512d18c29..166a5faec 100644 --- a/changes/trove-2017-009 +++ b/changes/trove-2017-009 @@ -1,4 +1,4 @@ - o Major fixes (security): + o Major bugfixes (security): - When checking for replays in the INTRODUCE1 cell data for a (legacy) hiddden service, correctly detect replays in the RSA-encrypted part of the cell. We were previously checking for replays on the entire cell, ___ 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.1] Use local descriptor object to exclude self in path selection
commit 6ab07419c88e35c6d8610e20fb3cea16e39c8acd Author: David Goulet Date: Tue Nov 28 19:02:00 2017 -0500 Use local descriptor object to exclude self in path selection TROVE-2017-12. Severity: Medium When choosing a random node for a circuit, directly use our router descriptor to exclude ourself instead of the one in the global descriptor list. That list could be empty because tor could be downloading them which could lead to not excluding ourself. Closes #21534 --- changes/trove-2017-012-part1 | 6 ++ src/or/routerlist.c | 5 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/trove-2017-012-part1 b/changes/trove-2017-012-part1 new file mode 100644 index 0..9fccc2cf6 --- /dev/null +++ b/changes/trove-2017-012-part1 @@ -0,0 +1,6 @@ + o Major bugfixes (security, relay): +- When running as a relay, make sure that we never build a path through + ourselves, even in the case where we have somehow lost the version of + our descriptor appearing in the consensus. Fixes part of bug 21534; + bugfix on 0.2.0.1-alpha. This issue is also tracked as TROVE-2017-012 + and CVE-2017-8822. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 07e87724b..3bf1eb895 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2411,7 +2411,10 @@ router_choose_random_node(smartlist_t *excludedsmartlist, }); } - if ((r = routerlist_find_my_routerinfo())) + /* If the node_t is not found we won't be to exclude ourself but we + * won't be able to pick ourself in router_choose_random_node() so + * this is fine to at least try with our routerinfo_t object. */ + if ((r = router_get_my_routerinfo())) routerlist_add_node_and_family(excludednodes, r); router_add_running_nodes_to_smartlist(sl, allow_invalid, ___ 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.1] Merge branch 'trove-2017-010_029' into maint-0.2.9
commit 52d7af631cb1075289ba519d0c3b89e0b5816f5e Merge: 072e194a1 2c0487ecf Author: Nick Mathewson Date: Thu Nov 30 12:07:26 2017 -0500 Merge branch 'trove-2017-010_029' into maint-0.2.9 changes/trove-2017-010 | 6 ++ src/or/protover.c | 5 + 2 files changed, 11 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.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 7e2b012b46a4ade2818e47be15d76255cf6f121e Merge: 52d7af631 ba4a9cf0c Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/rendservice.c | 8 +++- src/or/routerlist.c | 5 - 7 files changed, 53 insertions(+), 5 deletions(-) ___ 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.1] Guard: Don't pick ourselves as a possible Guard
commit 91cee3c9e73aba089804cd88305115fc3ab1f76c Author: David Goulet Date: Tue Nov 28 19:09:13 2017 -0500 Guard: Don't pick ourselves as a possible Guard TROVE-2017-12. Severity: Medium Thankfully, tor will close any circuits that we try to extend to ourselves so this is not problematic but annoying. Part of #21534. --- changes/trove-2017-012-part2 | 5 + src/or/entrynodes.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/trove-2017-012-part2 b/changes/trove-2017-012-part2 new file mode 100644 index 0..ed994c5b0 --- /dev/null +++ b/changes/trove-2017-012-part2 @@ -0,0 +1,5 @@ + o Major bugfixes (security, relay): +- When running as a relay, make sure that we never ever choose ourselves + as a guard. Previously, this was possible. Fixes part of bug 21534; + bugfix on 0.3.0.1-alpha. This issue is also tracked as TROVE-2017-012 + and CVE-2017-8822. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d762afdcf..0109da8e0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -740,7 +740,8 @@ node_is_possible_guard(const node_t *node) node->is_stable && node->is_fast && node->is_valid && - node_is_dir(node)); + node_is_dir(node) && + !router_digest_is_me(node->identity)); } /** ___ 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.1] Merge branch 'maint-0.2.5' into maint-0.2.8
commit 2e219291bee2d378344286ba091ba09527b07188 Merge: ba4a9cf0c 6bda6777c Author: Nick Mathewson Date: Thu Nov 30 12:21:36 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" to avoid version bump ___ 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.1] version bump to 0.2.8.17
commit 6ee44725449794951f93020bb04e5fa3ba784742
Author: Nick Mathewson
Date: Thu Nov 30 12:22:32 2017 -0500
version bump to 0.2.8.17
---
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 6fb101bf9..94cebf401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.16-dev])
+AC_INIT([tor],[0.2.8.17])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index b9eac37c5..b9076fbc7 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.2.8.16-dev"
+!define VERSION "0.2.8.17"
!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 211243d1d..9db6ef209 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.8.16-dev"
+#define VERSION "0.2.8.17"
___
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] Fix length of replaycache-checked data.
commit 2834cc9c18230c36278ffa94a252abeb91b6cff9
Author: Nick Mathewson
Date: Sat Nov 11 13:40:21 2017 -0500
Fix length of replaycache-checked data.
This is a regression; we should have been checking only the
public-key encrypted portion. Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.
---
changes/trove-2017-009 | 10 ++
src/or/rendservice.c | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/changes/trove-2017-009 b/changes/trove-2017-009
new file mode 100644
index 0..512d18c29
--- /dev/null
+++ b/changes/trove-2017-009
@@ -0,0 +1,10 @@
+ o Major fixes (security):
+- When checking for replays in the INTRODUCE1 cell data for a (legacy)
+ hiddden service, correctly detect replays in the RSA-encrypted part of
+ the cell. We were previously checking for replays on the entire cell,
+ but those can be circumvented due to the malleability of Tor's legacy
+ hybrid encryption. This fix helps prevent a traffic confirmation
+ attack. Fixes bug 24244; bugfix on 0.2.4.1-alpha. This issue is also
+ tracked as TROVE-2017-009 and CVE-2017-8819.
+
+
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d958de9df..ba8891ead 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1162,6 +1162,7 @@ rend_service_introduce(origin_circuit_t *circuit, const
uint8_t *request,
time_t now = time(NULL);
time_t elapsed;
int replay;
+ size_t keylen;
/* Do some initial validation and logging before we parse the cell */
if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) {
@@ -1245,9 +1246,10 @@ rend_service_introduce(origin_circuit_t *circuit, const
uint8_t *request,
}
/* check for replay of PK-encrypted portion. */
+ keylen = crypto_pk_keysize(intro_key);
replay = replaycache_add_test_and_elapsed(
intro_point->accepted_intro_rsa_parts,
-parsed_req->ciphertext, parsed_req->ciphertext_len,
+parsed_req->ciphertext, MIN(parsed_req->ciphertext_len, keylen),
&elapsed);
if (replay) {
___
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.1] Merge branch 'trove-2017-012_025' into maint-0.2.5
commit f49876d66efbc5679ba7d9d9c6538c763b8e06b5 Merge: 08ce39fb0 6ab07419c Author: Nick Mathewson Date: Thu Nov 30 12:06:21 2017 -0500 Merge branch 'trove-2017-012_025' into maint-0.2.5 changes/trove-2017-012-part1 | 6 ++ src/or/routerlist.c | 5 - 2 files changed, 10 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.1] hs-v2: Remove any expiring intro from the retry list
commit 3030741b5d24e9ae36e6d72c6a8c7d035fde9d2a
Author: David Goulet
Date: Tue Nov 21 10:16:08 2017 -0500
hs-v2: Remove any expiring intro from the retry list
TROVE-2017-13. Severity: High.
In the unlikely case that a hidden service could be missing intro
circuit(s),
that it didn't have enough directory information to open new circuits and
that
an intro point was about to expire, a use-after-free is possible because of
the intro point object being both in the retry list and expiring list at the
same time.
The intro object would get freed after the circuit failed to open and then
access a second time when cleaned up from the expiring list.
Fixes #24313
---
changes/bug24313 | 5 +
src/or/rendservice.c | 4
2 files changed, 9 insertions(+)
diff --git a/changes/bug24313 b/changes/bug24313
new file mode 100644
index 0..b927ec3ba
--- /dev/null
+++ b/changes/bug24313
@@ -0,0 +1,5 @@
+ o Major bugfixes (security, hidden service v2):
+- Fix a use-after-free error that could crash v2 Tor hidden services
+ when it failed to open circuits while expiring introductions
+ points. Fixes bug 24313; bugfix on 0.2.7.2-alpha. This
+ issue is also tracked as TROVE-2017-013 and CVE-2017-8823.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 0a5b5efd5..cbf998136 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3444,6 +3444,10 @@ remove_invalid_intro_points(rend_service_t *service,
log_info(LD_REND, "Expiring %s as intro point for %s.",
safe_str_client(extend_info_describe(intro->extend_info)),
safe_str_client(service->service_id));
+ /* We might have put it in the retry list if so, undo. */
+ if (retry_nodes) {
+smartlist_remove(retry_nodes, intro);
+ }
smartlist_add(service->expiring_nodes, intro);
SMARTLIST_DEL_CURRENT(service->intro_nodes, intro);
/* Intro point is expired, we need a new one thus don't consider it
___
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.1] Merge branch 'maint-0.2.9' into maint-0.3.0
commit 5fc0587c040339357bc3fc37f1b5474f1c3d1a33 Merge: d459c08b7 7e2b012b4 Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-010 | 6 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/protover.c| 5 + src/or/rendservice.c | 8 +++- src/or/routerlist.c | 5 - 9 files changed, 64 insertions(+), 5 deletions(-) ___ 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.1] Merge branch 'trove-2017-009_025' into maint-0.2.5
commit a6a0c7a4ecc22a744b123a47d466963f6023a11f Merge: 831d3b794 75509dc82 Author: Nick Mathewson Date: Thu Nov 30 12:05:59 2017 -0500 Merge branch 'trove-2017-009_025' into maint-0.2.5 changes/trove-2017-009 | 10 ++ src/or/rendservice.c | 4 +++- 2 files changed, 13 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.1] Merge branch 'maint-0.2.5' into maint-0.2.8
commit ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e Merge: 3030741b5 f49876d66 Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/trove-2017-009 | 10 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/rendservice.c | 4 +++- src/or/routerlist.c | 5 - 6 files changed, 44 insertions(+), 5 deletions(-) ___ 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.1] Merge branch 'trove-2017-011_025' into maint-0.2.5
commit 08ce39fb0fd50ab0da4201201fa07e7776cb09e7 Merge: a6a0c7a4e 1880a6a88 Author: Nick Mathewson Date: Thu Nov 30 12:06:17 2017 -0500 Merge branch 'trove-2017-011_025' into maint-0.2.5 changes/trove-2017-011 | 8 src/common/crypto.c| 16 +--- 2 files changed, 21 insertions(+), 3 deletions(-) ___ 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.1] version bump to 0.2.9.14
commit 16c9cfd6588d04440b355a4cb8599bb7e7dd9702
Author: Nick Mathewson
Date: Thu Nov 30 12:24:07 2017 -0500
version bump to 0.2.9.14
---
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 f2c3f90ba..3e8084cde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.13-dev])
+AC_INIT([tor],[0.2.9.14])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 919115b75..c5d2d7e89 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.2.9.13-dev"
+!define VERSION "0.2.9.14"
!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 9c9166be1..46cd55dd6 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.2.9.13-dev"
+#define VERSION "0.2.9.14"
___
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.1] Merge branch 'maint-0.3.0' into maint-0.3.1
commit ee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4
Merge: 500f04a74 5fc0587c0
Author: Nick Mathewson
Date: Thu Nov 30 12:07:59 2017 -0500
Merge branch 'maint-0.3.0' into maint-0.3.1
changes/bug24313 | 5 +
changes/trove-2017-009 | 10 ++
changes/trove-2017-010 | 6 ++
changes/trove-2017-011 | 8
changes/trove-2017-012-part1 | 6 ++
changes/trove-2017-012-part2 | 5 +
src/common/crypto.c | 16 +---
src/or/entrynodes.c | 3 ++-
src/or/protover.c| 5 +
src/or/rendservice.c | 8 +++-
src/or/routerlist.c | 5 -
11 files changed, 71 insertions(+), 6 deletions(-)
diff --cc src/or/routerlist.c
index 0e45f63f7,83e513448..507580f19
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2810,17 -2811,23 +2810,20 @@@ router_choose_random_node(smartlist_t *
rule = weight_for_exit ? WEIGHT_FOR_EXIT :
(need_guard ? WEIGHT_FOR_GUARD : WEIGHT_FOR_MID);
- /* Exclude relays that allow single hop exit circuits, if the user
- * wants to (such relays might be risky) */
- if (get_options()->ExcludeSingleHopRelays) {
-SMARTLIST_FOREACH(nodelist_get_list(), node_t *, node,
- if (node_allows_single_hop_exits(node)) {
-smartlist_add(excludednodes, node);
- });
- }
+ /* Exclude relays that allow single hop exit circuits. This is an obsolete
+ * option since 0.2.9.2-alpha and done by default in 0.3.1.0-alpha. */
+ SMARTLIST_FOREACH(nodelist_get_list(), node_t *, node,
+if (node_allows_single_hop_exits(node)) {
+ smartlist_add(excludednodes, node);
+});
- if ((r = routerlist_find_my_routerinfo()))
+ /* If the node_t is not found we won't be to exclude ourself but we
+* won't be able to pick ourself in router_choose_random_node() so
+* this is fine to at least try with our routerinfo_t object. */
+ if ((r = router_get_my_routerinfo()))
routerlist_add_node_and_family(excludednodes, r);
- router_add_running_nodes_to_smartlist(sl, allow_invalid,
-need_uptime, need_capacity,
+ router_add_running_nodes_to_smartlist(sl, need_uptime, need_capacity,
need_guard, need_desc, pref_addr,
direct_conn);
log_debug(LD_CIRC,
___
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.1] 0.3.1.9 changelog.
commit 727d3f1b5e6eeda721339151e3cd49ffa7efbb29 Author: Nick Mathewson Date: Thu Nov 30 14:58:58 2017 -0500 0.3.1.9 changelog. --- ChangeLog| 94 changes/bastet_v6| 4 -- changes/bug18329-minimal | 6 --- changes/bug21394 | 9 - changes/bug23470 | 6 --- changes/bug23693 | 6 --- changes/bug24262 | 3 -- changes/bug24313 | 5 --- changes/bug8185_025 | 6 --- changes/geoip-2017-11-06 | 4 -- changes/ticket22895 | 3 -- changes/trove-2017-009 | 10 - changes/trove-2017-010 | 6 --- changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 --- changes/trove-2017-012-part2 | 5 --- 16 files changed, 94 insertions(+), 87 deletions(-) diff --git a/ChangeLog b/ChangeLog index 572ddd352..0e3a738e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,97 @@ +Changes in version 0.3.1.9 - 2017-12-01: + Tor 0.3.1.9 backports important security and stability fixes from the + 0.3.2 development series. All Tor users should upgrade to this + release, or to another of the releases coming out today. + + o Major bugfixes (security, backport from 0.3.2.6-alpha): +- Fix a denial of service bug where an attacker could use a + malformed directory object to cause a Tor instance to pause while + OpenSSL would try to read a passphrase from the terminal. (Tor + instances run without a terminal, which is the case for most Tor + packages, are not impacted.) Fixes bug 24246; bugfix on every + version of Tor. Also tracked as TROVE-2017-011 and CVE-2017-8821. + Found by OSS-Fuzz as testcase 6360145429790720. +- Fix a denial of service issue where an attacker could crash a + directory authority using a malformed router descriptor. Fixes bug + 24245; bugfix on 0.2.9.4-alpha. Also tracked as TROVE-2017-010 + and CVE-2017-8820. +- When checking for replays in the INTRODUCE1 cell data for a + (legacy) onion service, correctly detect replays in the RSA- + encrypted part of the cell. We were previously checking for + replays on the entire cell, but those can be circumvented due to + the malleability of Tor's legacy hybrid encryption. This fix helps + prevent a traffic confirmation attack. Fixes bug 24244; bugfix on + 0.2.4.1-alpha. This issue is also tracked as TROVE-2017-009 + and CVE-2017-8819. + + o Major bugfixes (security, onion service v2, backport from 0.3.2.6-alpha): +- Fix a use-after-free error that could crash v2 Tor onion services + when they failed to open circuits while expiring introduction + points. Fixes bug 24313; bugfix on 0.2.7.2-alpha. This issue is + also tracked as TROVE-2017-013 and CVE-2017-8823. + + o Major bugfixes (security, relay, backport from 0.3.2.6-alpha): +- When running as a relay, make sure that we never build a path + through ourselves, even in the case where we have somehow lost the + version of our descriptor appearing in the consensus. Fixes part + of bug 21534; bugfix on 0.2.0.1-alpha. This issue is also tracked + as TROVE-2017-012 and CVE-2017-8822. +- When running as a relay, make sure that we never choose ourselves + as a guard. Fixes part of bug 21534; bugfix on 0.3.0.1-alpha. This + issue is also tracked as TROVE-2017-012 and CVE-2017-8822. + + o Major bugfixes (exit relays, DNS, backport from 0.3.2.4-alpha): +- Fix an issue causing DNS to fail on high-bandwidth exit nodes, + making them nearly unusable. Fixes bugs 21394 and 18580; bugfix on + 0.1.2.2-alpha, which introduced eventdns. Thanks to Dhalgren for + identifying and finding a workaround to this bug and to Moritz, + Arthur Edelstein, and Roger for helping to track it down and + analyze it. + + o Minor features (bridge): +- Bridges now include notice in their descriptors that they are + bridges, and notice of their distribution status, based on their + publication settings. Implements ticket 18329. For more fine- + grained control of how a bridge is distributed, upgrade to 0.3.2.x + or later. + + o Minor features (directory authority, backport from 0.3.2.6-alpha): +- Add an IPv6 address for the "bastet" directory authority. Closes + ticket 24394. + + o Minor features (geoip): +- Update geoip and geoip6 to the November 6 2017 Maxmind GeoLite2 + Country database. + + o Minor bugfix (relay address resolution, backport from 0.3.2.1-alpha): +- Avoid unnecessary calls to directory_fetches_from_authorities() on + relays, to prevent spurious address resolutions and descriptor + rebuilds. This is a mitigation for bug 21789. Fixes bug 23470; + bugfix on in 0.2.8.1-alpha. + + o Minor bugfixes (compilation, backport from 0.3.2.1-alpha): +- Fix unused variable warnings in donna's Curve25519
[tor-commits] [tor/release-0.3.1] version bump to 0.3.0.13
commit f2ecdeb724c68f854f00a0095a0849627fd4e17b
Author: Nick Mathewson
Date: Thu Nov 30 12:25:01 2017 -0500
version bump to 0.3.0.13
---
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 315bd2df3..10612eba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.12-dev])
+AC_INIT([tor],[0.3.0.13])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 160ef2675..bd8cf3d5c 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.0.12-dev"
+!define VERSION "0.3.0.13"
!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 f5a7451a5..5795552a4 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.0.12-dev"
+#define VERSION "0.3.0.13"
___
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] hs-v2: Remove any expiring intro from the retry list
commit 3030741b5d24e9ae36e6d72c6a8c7d035fde9d2a
Author: David Goulet
Date: Tue Nov 21 10:16:08 2017 -0500
hs-v2: Remove any expiring intro from the retry list
TROVE-2017-13. Severity: High.
In the unlikely case that a hidden service could be missing intro
circuit(s),
that it didn't have enough directory information to open new circuits and
that
an intro point was about to expire, a use-after-free is possible because of
the intro point object being both in the retry list and expiring list at the
same time.
The intro object would get freed after the circuit failed to open and then
access a second time when cleaned up from the expiring list.
Fixes #24313
---
changes/bug24313 | 5 +
src/or/rendservice.c | 4
2 files changed, 9 insertions(+)
diff --git a/changes/bug24313 b/changes/bug24313
new file mode 100644
index 0..b927ec3ba
--- /dev/null
+++ b/changes/bug24313
@@ -0,0 +1,5 @@
+ o Major bugfixes (security, hidden service v2):
+- Fix a use-after-free error that could crash v2 Tor hidden services
+ when it failed to open circuits while expiring introductions
+ points. Fixes bug 24313; bugfix on 0.2.7.2-alpha. This
+ issue is also tracked as TROVE-2017-013 and CVE-2017-8823.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 0a5b5efd5..cbf998136 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3444,6 +3444,10 @@ remove_invalid_intro_points(rend_service_t *service,
log_info(LD_REND, "Expiring %s as intro point for %s.",
safe_str_client(extend_info_describe(intro->extend_info)),
safe_str_client(service->service_id));
+ /* We might have put it in the retry list if so, undo. */
+ if (retry_nodes) {
+smartlist_remove(retry_nodes, intro);
+ }
smartlist_add(service->expiring_nodes, intro);
SMARTLIST_DEL_CURRENT(service->intro_nodes, intro);
/* Intro point is expired, we need a new one thus don't consider it
___
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.1] Merge branch 'maint-0.3.1' into release-0.3.1
commit 94ad23deb216651844ab31c17809afa2fc8f9da1 Merge: d8d52f2b7 4ebd43654 Author: Nick Mathewson Date: Thu Nov 30 12:28:39 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ___ 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.1] Merge branch 'maint-0.2.9' into maint-0.3.0
commit 8f36104574a6dcce6e6dbb9b49e1f3766ab56441 Merge: 5fc0587c0 16c9cfd65 Author: Nick Mathewson Date: Thu Nov 30 12:24:13 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 ___ 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.1] Merge branch 'maint-0.3.1' into release-0.3.1
commit d8d52f2b73eca2cfa868d157bdb66d5ba1be5c30 Merge: 14746dfba ee48eb1eb Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-010 | 6 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ changes/trove-2017-012-part2 | 5 + src/common/crypto.c | 16 +--- src/or/entrynodes.c | 3 ++- src/or/protover.c| 5 + src/or/rendservice.c | 8 +++- src/or/routerlist.c | 5 - 11 files changed, 71 insertions(+), 6 deletions(-) ___ 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.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 1fd6e25522ed064e8043f4548fbd33fca9246295 Merge: 7e2b012b4 6ee447254 Author: Nick Mathewson Date: Thu Nov 30 12:22:38 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump. ___ 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.1] bump to 0.2.5.16
commit 6bda6777c1e86a54dedafd1fadd6142b1ff4955a
Author: Nick Mathewson
Date: Thu Nov 30 12:19:48 2017 -0500
bump to 0.2.5.16
---
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 317778275..67fddd7b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.15-dev])
+AC_INIT([tor],[0.2.5.16])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 6dc7cbd76..c88262afa 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.2.5.15-dev"
+!define VERSION "0.2.5.16"
!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 5ba3ec194..87ba1f11a 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.15-dev"
+#define VERSION "0.2.5.16"
___
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] Handle NULL input to protover_compute_for_old_tor()
commit 2c0487ecfb410d1361b114e60d8e9ffd2ed092ec
Author: Nick Mathewson
Date: Sat Nov 11 13:56:35 2017 -0500
Handle NULL input to protover_compute_for_old_tor()
Fixes bug 24245; bugfix on 0.2.9.4-alpha. TROVE-2017-010.
---
changes/trove-2017-010 | 6 ++
src/or/protover.c | 5 +
2 files changed, 11 insertions(+)
diff --git a/changes/trove-2017-010 b/changes/trove-2017-010
new file mode 100644
index 0..d5bf9333d
--- /dev/null
+++ b/changes/trove-2017-010
@@ -0,0 +1,6 @@
+ o Major bugfixes (security):
+- Fix a denial-of-service issue where an attacker could crash
+ a directory authority using a malformed router descriptor.
+ Fixes bug 24245; bugfix on 0.2.9.4-alpha. Also tracked
+ as TROVE-2017-010 and CVE-2017-8820.
+
diff --git a/src/or/protover.c b/src/or/protover.c
index 0a4d4fb8f..98957cabd 100644
--- a/src/or/protover.c
+++ b/src/or/protover.c
@@ -694,6 +694,11 @@ protocol_list_contains(const smartlist_t *protos,
const char *
protover_compute_for_old_tor(const char *version)
{
+ if (version == NULL) {
+/* No known version; guess the oldest series that is still supported. */
+version = "0.2.5.15";
+ }
+
if (tor_version_as_new_as(version,
FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS)) {
return "";
___
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] Guard: Don't pick ourselves as a possible Guard
commit 91cee3c9e73aba089804cd88305115fc3ab1f76c Author: David Goulet Date: Tue Nov 28 19:09:13 2017 -0500 Guard: Don't pick ourselves as a possible Guard TROVE-2017-12. Severity: Medium Thankfully, tor will close any circuits that we try to extend to ourselves so this is not problematic but annoying. Part of #21534. --- changes/trove-2017-012-part2 | 5 + src/or/entrynodes.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/trove-2017-012-part2 b/changes/trove-2017-012-part2 new file mode 100644 index 0..ed994c5b0 --- /dev/null +++ b/changes/trove-2017-012-part2 @@ -0,0 +1,5 @@ + o Major bugfixes (security, relay): +- When running as a relay, make sure that we never ever choose ourselves + as a guard. Previously, this was possible. Fixes part of bug 21534; + bugfix on 0.3.0.1-alpha. This issue is also tracked as TROVE-2017-012 + and CVE-2017-8822. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d762afdcf..0109da8e0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -740,7 +740,8 @@ node_is_possible_guard(const node_t *node) node->is_stable && node->is_fast && node->is_valid && - node_is_dir(node)); + node_is_dir(node) && + !router_digest_is_me(node->identity)); } /** ___ 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] Avoid asking for passphrase on junky PEM input
commit 1880a6a88e240556a8e6b169f1160aa8220ab0ec
Author: Nick Mathewson
Date: Sat Nov 11 14:21:37 2017 -0500
Avoid asking for passphrase on junky PEM input
Fixes bug 24246 and TROVE-2017-011.
This bug is so old, it's in Matej's code. Seems to have been
introduced with e01522bbed6eea.
---
changes/trove-2017-011 | 8
src/common/crypto.c| 16 +---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/changes/trove-2017-011 b/changes/trove-2017-011
new file mode 100644
index 0..82d20d9e7
--- /dev/null
+++ b/changes/trove-2017-011
@@ -0,0 +1,8 @@
+ o Major bugfixes (security):
+- Fix a denial of service bug where an attacker could use a malformed
+ directory object to cause a Tor instance to pause while OpenSSL would
+ try to read a passphrase from the terminal. (If the terminal was not
+ available, tor would continue running.) Fixes bug 24246; bugfix on
+ every version of Tor. Also tracked as TROVE-2017-011 and
+ CVE-2017-8821. Found by OSS-Fuzz as testcase 6360145429790720.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index f7362765d..8d816652d 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -592,11 +592,21 @@ crypto_pk_generate_key_with_bits(crypto_pk_t *env, int
bits)
return 0;
}
+/** A PEM callback that always reports a failure to get a password */
+static int
+pem_no_password_cb(char *buf, int size, int rwflag, void *u)
+{
+ (void)buf;
+ (void)size;
+ (void)rwflag;
+ (void)u;
+ return 0;
+}
+
/** Read a PEM-encoded private key from the len-byte string s
* into env. Return 0 on success, -1 on failure. If len is -1,
* the string is nul-terminated.
*/
-/* Used here, and used for testing. */
int
crypto_pk_read_private_key_from_string(crypto_pk_t *env,
const char *s, ssize_t len)
@@ -615,7 +625,7 @@ crypto_pk_read_private_key_from_string(crypto_pk_t *env,
if (env->key)
RSA_free(env->key);
- env->key = PEM_read_bio_RSAPrivateKey(b,NULL,NULL,NULL);
+ env->key = PEM_read_bio_RSAPrivateKey(b,NULL,pem_no_password_cb,NULL);
BIO_free(b);
@@ -747,7 +757,7 @@ crypto_pk_read_public_key_from_string(crypto_pk_t *env,
const char *src,
if (env->key)
RSA_free(env->key);
- env->key = PEM_read_bio_RSAPublicKey(b, NULL, NULL, NULL);
+ env->key = PEM_read_bio_RSAPublicKey(b, NULL, pem_no_password_cb, NULL);
BIO_free(b);
if (!env->key) {
crypto_log_errors(LOG_WARN, "reading public key from string");
___
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.1] Merge branch 'maint-0.3.0' into maint-0.3.1
commit 6b9c2ac23e7dfbaeaefc1fd5923645850668e7af Merge: ee48eb1eb f2ecdeb72 Author: Nick Mathewson Date: Thu Nov 30 12:25:07 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump. ___ 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] Use local descriptor object to exclude self in path selection
commit 6ab07419c88e35c6d8610e20fb3cea16e39c8acd Author: David Goulet Date: Tue Nov 28 19:02:00 2017 -0500 Use local descriptor object to exclude self in path selection TROVE-2017-12. Severity: Medium When choosing a random node for a circuit, directly use our router descriptor to exclude ourself instead of the one in the global descriptor list. That list could be empty because tor could be downloading them which could lead to not excluding ourself. Closes #21534 --- changes/trove-2017-012-part1 | 6 ++ src/or/routerlist.c | 5 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/trove-2017-012-part1 b/changes/trove-2017-012-part1 new file mode 100644 index 0..9fccc2cf6 --- /dev/null +++ b/changes/trove-2017-012-part1 @@ -0,0 +1,6 @@ + o Major bugfixes (security, relay): +- When running as a relay, make sure that we never build a path through + ourselves, even in the case where we have somehow lost the version of + our descriptor appearing in the consensus. Fixes part of bug 21534; + bugfix on 0.2.0.1-alpha. This issue is also tracked as TROVE-2017-012 + and CVE-2017-8822. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 07e87724b..3bf1eb895 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2411,7 +2411,10 @@ router_choose_random_node(smartlist_t *excludedsmartlist, }); } - if ((r = routerlist_find_my_routerinfo())) + /* If the node_t is not found we won't be to exclude ourself but we + * won't be able to pick ourself in router_choose_random_node() so + * this is fine to at least try with our routerinfo_t object. */ + if ((r = router_get_my_routerinfo())) routerlist_add_node_and_family(excludednodes, r); router_add_running_nodes_to_smartlist(sl, allow_invalid, ___ 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.1] version bump to 0.3.1.9
commit 4ebd436541872addb62aeb5caa8ffb55fbcbd59e
Author: Nick Mathewson
Date: Thu Nov 30 12:25:48 2017 -0500
version bump to 0.3.1.9
---
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 644d7231d..5afcdddb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.1.8-dev])
+AC_INIT([tor],[0.3.1.9])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 61c2713c2..391d63c00 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.1.8-dev"
+!define VERSION "0.3.1.9"
!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 0a2efa341..ccb82d063 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.1.8-dev"
+#define VERSION "0.3.1.9"
___
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 'trove-2017-009_025' into maint-0.2.5
commit a6a0c7a4ecc22a744b123a47d466963f6023a11f Merge: 831d3b794 75509dc82 Author: Nick Mathewson Date: Thu Nov 30 12:05:59 2017 -0500 Merge branch 'trove-2017-009_025' into maint-0.2.5 changes/trove-2017-009 | 10 ++ src/or/rendservice.c | 4 +++- 2 files changed, 13 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.8' into maint-0.2.9
commit 7e2b012b46a4ade2818e47be15d76255cf6f121e Merge: 52d7af631 ba4a9cf0c Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/rendservice.c | 8 +++- src/or/routerlist.c | 5 - 7 files changed, 53 insertions(+), 5 deletions(-) ___ 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 'trove-2017-012_030' into maint-0.3.0
commit d459c08b7d5cb1766bda5443ea2750bca160212d Merge: 766d0a2d9 91cee3c9e Author: Nick Mathewson Date: Thu Nov 30 12:07:43 2017 -0500 Merge branch 'trove-2017-012_030' into maint-0.3.0 changes/trove-2017-012-part2 | 5 + src/or/entrynodes.c | 3 ++- 2 files changed, 7 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 'trove-2017-010_029' into maint-0.2.9
commit 52d7af631cb1075289ba519d0c3b89e0b5816f5e Merge: 072e194a1 2c0487ecf Author: Nick Mathewson Date: Thu Nov 30 12:07:26 2017 -0500 Merge branch 'trove-2017-010_029' into maint-0.2.9 changes/trove-2017-010 | 6 ++ src/or/protover.c | 5 + 2 files changed, 11 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.2.5' into maint-0.2.8
commit ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e Merge: 3030741b5 f49876d66 Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/trove-2017-009 | 10 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/rendservice.c | 4 +++- src/or/routerlist.c | 5 - 6 files changed, 44 insertions(+), 5 deletions(-) ___ 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 'trove-2017-011_025' into maint-0.2.5
commit 08ce39fb0fd50ab0da4201201fa07e7776cb09e7 Merge: a6a0c7a4e 1880a6a88 Author: Nick Mathewson Date: Thu Nov 30 12:06:17 2017 -0500 Merge branch 'trove-2017-011_025' into maint-0.2.5 changes/trove-2017-011 | 8 src/common/crypto.c| 16 +--- 2 files changed, 21 insertions(+), 3 deletions(-) ___ 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.0' into maint-0.3.1
commit ee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4
Merge: 500f04a74 5fc0587c0
Author: Nick Mathewson
Date: Thu Nov 30 12:07:59 2017 -0500
Merge branch 'maint-0.3.0' into maint-0.3.1
changes/bug24313 | 5 +
changes/trove-2017-009 | 10 ++
changes/trove-2017-010 | 6 ++
changes/trove-2017-011 | 8
changes/trove-2017-012-part1 | 6 ++
changes/trove-2017-012-part2 | 5 +
src/common/crypto.c | 16 +---
src/or/entrynodes.c | 3 ++-
src/or/protover.c| 5 +
src/or/rendservice.c | 8 +++-
src/or/routerlist.c | 5 -
11 files changed, 71 insertions(+), 6 deletions(-)
diff --cc src/or/routerlist.c
index 0e45f63f7,83e513448..507580f19
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2810,17 -2811,23 +2810,20 @@@ router_choose_random_node(smartlist_t *
rule = weight_for_exit ? WEIGHT_FOR_EXIT :
(need_guard ? WEIGHT_FOR_GUARD : WEIGHT_FOR_MID);
- /* Exclude relays that allow single hop exit circuits, if the user
- * wants to (such relays might be risky) */
- if (get_options()->ExcludeSingleHopRelays) {
-SMARTLIST_FOREACH(nodelist_get_list(), node_t *, node,
- if (node_allows_single_hop_exits(node)) {
-smartlist_add(excludednodes, node);
- });
- }
+ /* Exclude relays that allow single hop exit circuits. This is an obsolete
+ * option since 0.2.9.2-alpha and done by default in 0.3.1.0-alpha. */
+ SMARTLIST_FOREACH(nodelist_get_list(), node_t *, node,
+if (node_allows_single_hop_exits(node)) {
+ smartlist_add(excludednodes, node);
+});
- if ((r = routerlist_find_my_routerinfo()))
+ /* If the node_t is not found we won't be to exclude ourself but we
+* won't be able to pick ourself in router_choose_random_node() so
+* this is fine to at least try with our routerinfo_t object. */
+ if ((r = router_get_my_routerinfo()))
routerlist_add_node_and_family(excludednodes, r);
- router_add_running_nodes_to_smartlist(sl, allow_invalid,
-need_uptime, need_capacity,
+ router_add_running_nodes_to_smartlist(sl, need_uptime, need_capacity,
need_guard, need_desc, pref_addr,
direct_conn);
log_debug(LD_CIRC,
___
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 'trove-2017-012_025' into maint-0.2.5
commit f49876d66efbc5679ba7d9d9c6538c763b8e06b5 Merge: 08ce39fb0 6ab07419c Author: Nick Mathewson Date: Thu Nov 30 12:06:21 2017 -0500 Merge branch 'trove-2017-012_025' into maint-0.2.5 changes/trove-2017-012-part1 | 6 ++ src/or/routerlist.c | 5 - 2 files changed, 10 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.3.1' into maint-0.3.2
commit fd73a168ca5bf8ea6a0fa01878dd16d356d14cfa
Merge: 25d50decb ee48eb1eb
Author: Nick Mathewson
Date: Thu Nov 30 12:07:59 2017 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24313 | 5 +
changes/trove-2017-009 | 10 ++
changes/trove-2017-010 | 6 ++
changes/trove-2017-011 | 8
changes/trove-2017-012-part1 | 6 ++
changes/trove-2017-012-part2 | 5 +
src/common/crypto.c | 16 +---
src/or/entrynodes.c | 3 ++-
src/or/protover.c| 5 +
src/or/rendservice.c | 8 +++-
src/or/routerlist.c | 5 -
11 files changed, 71 insertions(+), 6 deletions(-)
diff --cc src/or/routerlist.c
index 355f8e0fa,507580f19..af4f67dc1
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2825,21 -2810,17 +2825,24 @@@ router_choose_random_node(smartlist_t *
rule = weight_for_exit ? WEIGHT_FOR_EXIT :
(need_guard ? WEIGHT_FOR_GUARD : WEIGHT_FOR_MID);
- /* Exclude relays that allow single hop exit circuits. This is an obsolete
- * option since 0.2.9.2-alpha and done by default in 0.3.1.0-alpha. */
- SMARTLIST_FOREACH(nodelist_get_list(), node_t *, node,
+ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), node_t *, node) {
if (node_allows_single_hop_exits(node)) {
+ /* Exclude relays that allow single hop exit circuits. This is an
+ * obsolete option since 0.2.9.2-alpha and done by default in
+ * 0.3.1.0-alpha. */
smartlist_add(excludednodes, node);
-});
+} else if (rendezvous_v3 &&
+ !node_supports_v3_rendezvous_point(node)) {
+ /* Exclude relays that do not support to rendezvous for a hidden service
+ * version 3. */
+ smartlist_add(excludednodes, node);
+}
+ } SMARTLIST_FOREACH_END(node);
- if ((r = routerlist_find_my_routerinfo()))
+ /* If the node_t is not found we won't be to exclude ourself but we
+* won't be able to pick ourself in router_choose_random_node() so
+* this is fine to at least try with our routerinfo_t object. */
+ if ((r = router_get_my_routerinfo()))
routerlist_add_node_and_family(excludednodes, r);
router_add_running_nodes_to_smartlist(sl, need_uptime, need_capacity,
___
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.5' into maint-0.2.8
commit 2e219291bee2d378344286ba091ba09527b07188 Merge: ba4a9cf0c 6bda6777c Author: Nick Mathewson Date: Thu Nov 30 12:21:36 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" to avoid version bump ___ 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] Fix changes file
commit 75509dc82778a3bb866dca0fa86ae3e179ad78fa Author: Nick Mathewson Date: Thu Nov 30 11:52:40 2017 -0500 Fix changes file --- changes/trove-2017-009 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/trove-2017-009 b/changes/trove-2017-009 index 512d18c29..166a5faec 100644 --- a/changes/trove-2017-009 +++ b/changes/trove-2017-009 @@ -1,4 +1,4 @@ - o Major fixes (security): + o Major bugfixes (security): - When checking for replays in the INTRODUCE1 cell data for a (legacy) hiddden service, correctly detect replays in the RSA-encrypted part of the cell. We were previously checking for replays on the entire cell, ___ 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.8' into maint-0.2.9
commit 1fd6e25522ed064e8043f4548fbd33fca9246295 Merge: 7e2b012b4 6ee447254 Author: Nick Mathewson Date: Thu Nov 30 12:22:38 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump. ___ 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] version bump to 0.2.9.14
commit 16c9cfd6588d04440b355a4cb8599bb7e7dd9702
Author: Nick Mathewson
Date: Thu Nov 30 12:24:07 2017 -0500
version bump to 0.2.9.14
---
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 f2c3f90ba..3e8084cde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.13-dev])
+AC_INIT([tor],[0.2.9.14])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 919115b75..c5d2d7e89 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.2.9.13-dev"
+!define VERSION "0.2.9.14"
!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 9c9166be1..46cd55dd6 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.2.9.13-dev"
+#define VERSION "0.2.9.14"
___
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] version bump to 0.2.8.17
commit 6ee44725449794951f93020bb04e5fa3ba784742
Author: Nick Mathewson
Date: Thu Nov 30 12:22:32 2017 -0500
version bump to 0.2.8.17
---
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 6fb101bf9..94cebf401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.16-dev])
+AC_INIT([tor],[0.2.8.17])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index b9eac37c5..b9076fbc7 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.2.8.16-dev"
+!define VERSION "0.2.8.17"
!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 211243d1d..9db6ef209 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.8.16-dev"
+#define VERSION "0.2.8.17"
___
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.0
commit 8f36104574a6dcce6e6dbb9b49e1f3766ab56441 Merge: 5fc0587c0 16c9cfd65 Author: Nick Mathewson Date: Thu Nov 30 12:24:13 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 ___ 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] bump to 0.2.5.16
commit 6bda6777c1e86a54dedafd1fadd6142b1ff4955a
Author: Nick Mathewson
Date: Thu Nov 30 12:19:48 2017 -0500
bump to 0.2.5.16
---
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 317778275..67fddd7b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.15-dev])
+AC_INIT([tor],[0.2.5.16])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 6dc7cbd76..c88262afa 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.2.5.15-dev"
+!define VERSION "0.2.5.16"
!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 5ba3ec194..87ba1f11a 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.15-dev"
+#define VERSION "0.2.5.16"
___
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 c981cd431146b9c67b8e38e661cf856fa5399fcb Merge: 500975da9 fd73a168c Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-010 | 6 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ changes/trove-2017-012-part2 | 5 + src/common/crypto.c | 16 +--- src/or/entrynodes.c | 3 ++- src/or/protover.c| 5 + src/or/rendservice.c | 8 +++- src/or/routerlist.c | 5 - 11 files changed, 71 insertions(+), 6 deletions(-) ___ 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.0
commit 5fc0587c040339357bc3fc37f1b5474f1c3d1a33 Merge: d459c08b7 7e2b012b4 Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-010 | 6 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/protover.c| 5 + src/or/rendservice.c | 8 +++- src/or/routerlist.c | 5 - 9 files changed, 64 insertions(+), 5 deletions(-) ___ 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.1' into maint-0.3.2
commit 9c89e8e4354283e4596e82adb876653d4c95ac6c Merge: fd73a168c 4ebd43654 Author: Nick Mathewson Date: Thu Nov 30 12:25:53 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bumps ___ 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] version bump to 0.3.0.13
commit f2ecdeb724c68f854f00a0095a0849627fd4e17b
Author: Nick Mathewson
Date: Thu Nov 30 12:25:01 2017 -0500
version bump to 0.3.0.13
---
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 315bd2df3..10612eba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.12-dev])
+AC_INIT([tor],[0.3.0.13])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 160ef2675..bd8cf3d5c 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.0.12-dev"
+!define VERSION "0.3.0.13"
!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 f5a7451a5..5795552a4 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.0.12-dev"
+#define VERSION "0.3.0.13"
___
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] Re-flow the changelog.
commit 87012d076ef58bb9216c7952e0fd536f124aea68 Author: Nick Mathewson Date: Thu Nov 30 14:44:04 2017 -0500 Re-flow the changelog. --- ChangeLog | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index be43ff2ca..8a672f1f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,10 +9,9 @@ Changes in version 0.3.2.6-alpha - 2017-12-01 malformed directory object to cause a Tor instance to pause while OpenSSL would try to read a passphrase from the terminal. (Tor instances run without a terminal, which is the case for most Tor - packages, are not impacted.) Fixes bug - 24246; bugfix on every version of Tor. Also tracked as TROVE-2017- - 011 and CVE-2017-8821. Found by OSS-Fuzz as - testcase 6360145429790720. + packages, are not impacted.) Fixes bug 24246; bugfix on every + version of Tor. Also tracked as TROVE-2017-011 and CVE-2017-8821. + Found by OSS-Fuzz as testcase 6360145429790720. - Fix a denial of service issue where an attacker could crash a directory authority using a malformed router descriptor. Fixes bug 24245; bugfix on 0.2.9.4-alpha. Also tracked as TROVE-2017-010 @@ -38,10 +37,9 @@ Changes in version 0.3.2.6-alpha - 2017-12-01 version of our descriptor appearing in the consensus. Fixes part of bug 21534; bugfix on 0.2.0.1-alpha. This issue is also tracked as TROVE-2017-012 and CVE-2017-8822. -- When running as a relay, make sure that we never choose - ourselves as a guard. Fixes part of - bug 21534; bugfix on 0.3.0.1-alpha. This issue is also tracked as - TROVE-2017-012 and CVE-2017-8822. +- When running as a relay, make sure that we never choose ourselves + as a guard. Fixes part of bug 21534; bugfix on 0.3.0.1-alpha. This + issue is also tracked as TROVE-2017-012 and CVE-2017-8822. o Minor feature (relay statistics): - Change relay bandwidth reporting stats interval from 4 hours to 24 ___ 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.0' into maint-0.3.1
commit 6b9c2ac23e7dfbaeaefc1fd5923645850668e7af Merge: ee48eb1eb f2ecdeb72 Author: Nick Mathewson Date: Thu Nov 30 12:25:07 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump. ___ 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 9eb17cb7ba85283acd7be686b2e5b2aa7b89bdf2 Merge: c981cd431 424ab08b5 Author: Nick Mathewson Date: Thu Nov 30 12:28:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ___ 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] changelog edits from arma
commit 26f5da96b260cb012606b90d57ce41621e45b065 Author: Nick Mathewson Date: Thu Nov 30 14:42:49 2017 -0500 changelog edits from arma --- ChangeLog | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ad50007b..be43ff2ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,17 +7,18 @@ Changes in version 0.3.2.6-alpha - 2017-12-01 o Major bugfixes (security): - Fix a denial of service bug where an attacker could use a malformed directory object to cause a Tor instance to pause while - OpenSSL would try to read a passphrase from the terminal. (If the - terminal was not available, tor would continue running.) Fixes bug + OpenSSL would try to read a passphrase from the terminal. (Tor + instances run without a terminal, which is the case for most Tor + packages, are not impacted.) Fixes bug 24246; bugfix on every version of Tor. Also tracked as TROVE-2017- 011 and CVE-2017-8821. Found by OSS-Fuzz as testcase 6360145429790720. -- Fix a denial-of-service issue where an attacker could crash a +- Fix a denial of service issue where an attacker could crash a directory authority using a malformed router descriptor. Fixes bug 24245; bugfix on 0.2.9.4-alpha. Also tracked as TROVE-2017-010 and CVE-2017-8820. - When checking for replays in the INTRODUCE1 cell data for a - (legacy) hiddden service, correctly detect replays in the RSA- + (legacy) onion service, correctly detect replays in the RSA- encrypted part of the cell. We were previously checking for replays on the entire cell, but those can be circumvented due to the malleability of Tor's legacy hybrid encryption. This fix helps @@ -25,9 +26,9 @@ Changes in version 0.3.2.6-alpha - 2017-12-01 0.2.4.1-alpha. This issue is also tracked as TROVE-2017-009 and CVE-2017-8819. - o Major bugfixes (security, hidden service v2): -- Fix a use-after-free error that could crash v2 Tor hidden services - when it failed to open circuits while expiring introductions + o Major bugfixes (security, onion service v2): +- Fix a use-after-free error that could crash v2 Tor onion services + when they failed to open circuits while expiring introduction points. Fixes bug 24313; bugfix on 0.2.7.2-alpha. This issue is also tracked as TROVE-2017-013 and CVE-2017-8823. @@ -37,8 +38,8 @@ Changes in version 0.3.2.6-alpha - 2017-12-01 version of our descriptor appearing in the consensus. Fixes part of bug 21534; bugfix on 0.2.0.1-alpha. This issue is also tracked as TROVE-2017-012 and CVE-2017-8822. -- When running as a relay, make sure that we never ever choose - ourselves as a guard. Previously, this was possible. Fixes part of +- When running as a relay, make sure that we never choose + ourselves as a guard. Fixes part of bug 21534; bugfix on 0.3.0.1-alpha. This issue is also tracked as TROVE-2017-012 and CVE-2017-8822. ___ 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] bump to 0.3.2.6-alpha
commit 424ab08b5a54c8deee51da65ceb0d1f0a01fd945
Author: Nick Mathewson
Date: Thu Nov 30 12:26:30 2017 -0500
bump to 0.3.2.6-alpha
---
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 cf4466543..4413328de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.2.5-alpha-dev])
+AC_INIT([tor],[0.3.2.6-alpha])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 3ca0a672d..5c6463ff1 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.2.5-alpha-dev"
+!define VERSION "0.3.2.6-alpha"
!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 1f98b7e38..d04bc37ac 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.2.5-alpha-dev"
+#define VERSION "0.3.2.6-alpha"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] New releases
commit 3a73aeabec6b069264143784d35a5f944b33023a Author: Nick Mathewson Date: Fri Dec 1 08:55:33 2017 -0500 New releases --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c6f0288f..5f768488 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.3.1.8 -export DEVTAG=tor-0.3.2.5-alpha +export STABLETAG=tor-0.3.1.9 +export DEVTAG=tor-0.3.2.6-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index b4f13c80..f7073ca7 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ -0.3.1.8 -0.3.2.5-alpha +0.3.1.9 +0.3.2.6-alpha maint-7.0 ___ 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] version bump to 0.3.1.9
commit 4ebd436541872addb62aeb5caa8ffb55fbcbd59e
Author: Nick Mathewson
Date: Thu Nov 30 12:25:48 2017 -0500
version bump to 0.3.1.9
---
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 644d7231d..5afcdddb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.1.8-dev])
+AC_INIT([tor],[0.3.1.9])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 61c2713c2..391d63c00 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.1.8-dev"
+!define VERSION "0.3.1.9"
!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 0a2efa341..ccb82d063 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.1.8-dev"
+#define VERSION "0.3.1.9"
___
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] changelog for 0.3.2.6-alpha.
commit c66ce3419d20b266b72fa369d3350cf3ad631657 Author: Nick Mathewson Date: Thu Nov 30 12:34:32 2017 -0500 changelog for 0.3.2.6-alpha. --- ChangeLog| 59 changes/bastet_v6| 4 --- changes/bug24050 | 5 changes/bug24313 | 5 changes/ticket23856 | 4 --- changes/trove-2017-009 | 10 changes/trove-2017-010 | 6 - changes/trove-2017-011 | 8 -- changes/trove-2017-012-part1 | 6 - changes/trove-2017-012-part2 | 5 10 files changed, 59 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index e771f4640..9ad50007b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,62 @@ +Changes in version 0.3.2.6-alpha - 2017-12-01 + This version of Tor is the latest in the 0.3.2 alpha series. It + includes fixes for several important security issues. All Tor users + should upgrade to this release, or to one of the other releases coming + out today. + + o Major bugfixes (security): +- Fix a denial of service bug where an attacker could use a + malformed directory object to cause a Tor instance to pause while + OpenSSL would try to read a passphrase from the terminal. (If the + terminal was not available, tor would continue running.) Fixes bug + 24246; bugfix on every version of Tor. Also tracked as TROVE-2017- + 011 and CVE-2017-8821. Found by OSS-Fuzz as + testcase 6360145429790720. +- Fix a denial-of-service issue where an attacker could crash a + directory authority using a malformed router descriptor. Fixes bug + 24245; bugfix on 0.2.9.4-alpha. Also tracked as TROVE-2017-010 + and CVE-2017-8820. +- When checking for replays in the INTRODUCE1 cell data for a + (legacy) hiddden service, correctly detect replays in the RSA- + encrypted part of the cell. We were previously checking for + replays on the entire cell, but those can be circumvented due to + the malleability of Tor's legacy hybrid encryption. This fix helps + prevent a traffic confirmation attack. Fixes bug 24244; bugfix on + 0.2.4.1-alpha. This issue is also tracked as TROVE-2017-009 + and CVE-2017-8819. + + o Major bugfixes (security, hidden service v2): +- Fix a use-after-free error that could crash v2 Tor hidden services + when it failed to open circuits while expiring introductions + points. Fixes bug 24313; bugfix on 0.2.7.2-alpha. This issue is + also tracked as TROVE-2017-013 and CVE-2017-8823. + + o Major bugfixes (security, relay): +- When running as a relay, make sure that we never build a path + through ourselves, even in the case where we have somehow lost the + version of our descriptor appearing in the consensus. Fixes part + of bug 21534; bugfix on 0.2.0.1-alpha. This issue is also tracked + as TROVE-2017-012 and CVE-2017-8822. +- When running as a relay, make sure that we never ever choose + ourselves as a guard. Previously, this was possible. Fixes part of + bug 21534; bugfix on 0.3.0.1-alpha. This issue is also tracked as + TROVE-2017-012 and CVE-2017-8822. + + o Minor feature (relay statistics): +- Change relay bandwidth reporting stats interval from 4 hours to 24 + hours in order to reduce the efficiency of guard discovery + attacks. Fixes ticket 23856. + + o Minor features (directory authority): +- Add an IPv6 address for the "bastet" directory authority. Closes + ticket 24394. + + o Minor bugfixes (client): +- By default, do not enable storage of client-side DNS values. These + values were unused by default previously, but they should not have + been cached at all. Fixes bug 24050; bugfix on 0.2.6.3-alpha. + + Changes in version 0.3.2.5-alpha - 2017-11-22 Tor 0.3.2.5-alpha is the fifth alpha release in the 0.3.2.x series. It fixes several stability and reliability bugs, including a fix for diff --git a/changes/bastet_v6 b/changes/bastet_v6 deleted file mode 100644 index ee4e2c809..0 --- a/changes/bastet_v6 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (directory authority): -- Add an IPv6 address for the "bastet" directory authority. - Closes ticket 24394. - diff --git a/changes/bug24050 b/changes/bug24050 deleted file mode 100644 index d184a77ac..0 --- a/changes/bug24050 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (client): -- By default, do not enable storage of client-side DNS values. - These values were unused by default previously, but they should - not have been cached at all. Fixes bug 24050; bugfix on - 0.2.6.3-alpha. diff --git a/changes/bug24313 b/changes/bug24313 deleted file mode 100644 index b927ec3ba..0 --- a/changes/bug24313 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (security, hidden service v2): -- Fix a use-after-free error that could crash v2 Tor hidden se
[tor-commits] [tor/maint-0.2.5] Fix length of replaycache-checked data.
commit 2834cc9c18230c36278ffa94a252abeb91b6cff9
Author: Nick Mathewson
Date: Sat Nov 11 13:40:21 2017 -0500
Fix length of replaycache-checked data.
This is a regression; we should have been checking only the
public-key encrypted portion. Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.
---
changes/trove-2017-009 | 10 ++
src/or/rendservice.c | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/changes/trove-2017-009 b/changes/trove-2017-009
new file mode 100644
index 0..512d18c29
--- /dev/null
+++ b/changes/trove-2017-009
@@ -0,0 +1,10 @@
+ o Major fixes (security):
+- When checking for replays in the INTRODUCE1 cell data for a (legacy)
+ hiddden service, correctly detect replays in the RSA-encrypted part of
+ the cell. We were previously checking for replays on the entire cell,
+ but those can be circumvented due to the malleability of Tor's legacy
+ hybrid encryption. This fix helps prevent a traffic confirmation
+ attack. Fixes bug 24244; bugfix on 0.2.4.1-alpha. This issue is also
+ tracked as TROVE-2017-009 and CVE-2017-8819.
+
+
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d958de9df..ba8891ead 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1162,6 +1162,7 @@ rend_service_introduce(origin_circuit_t *circuit, const
uint8_t *request,
time_t now = time(NULL);
time_t elapsed;
int replay;
+ size_t keylen;
/* Do some initial validation and logging before we parse the cell */
if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) {
@@ -1245,9 +1246,10 @@ rend_service_introduce(origin_circuit_t *circuit, const
uint8_t *request,
}
/* check for replay of PK-encrypted portion. */
+ keylen = crypto_pk_keysize(intro_key);
replay = replaycache_add_test_and_elapsed(
intro_point->accepted_intro_rsa_parts,
-parsed_req->ciphertext, parsed_req->ciphertext_len,
+parsed_req->ciphertext, MIN(parsed_req->ciphertext_len, keylen),
&elapsed);
if (replay) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.5] Use local descriptor object to exclude self in path selection
commit 6ab07419c88e35c6d8610e20fb3cea16e39c8acd Author: David Goulet Date: Tue Nov 28 19:02:00 2017 -0500 Use local descriptor object to exclude self in path selection TROVE-2017-12. Severity: Medium When choosing a random node for a circuit, directly use our router descriptor to exclude ourself instead of the one in the global descriptor list. That list could be empty because tor could be downloading them which could lead to not excluding ourself. Closes #21534 --- changes/trove-2017-012-part1 | 6 ++ src/or/routerlist.c | 5 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/trove-2017-012-part1 b/changes/trove-2017-012-part1 new file mode 100644 index 0..9fccc2cf6 --- /dev/null +++ b/changes/trove-2017-012-part1 @@ -0,0 +1,6 @@ + o Major bugfixes (security, relay): +- When running as a relay, make sure that we never build a path through + ourselves, even in the case where we have somehow lost the version of + our descriptor appearing in the consensus. Fixes part of bug 21534; + bugfix on 0.2.0.1-alpha. This issue is also tracked as TROVE-2017-012 + and CVE-2017-8822. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 07e87724b..3bf1eb895 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2411,7 +2411,10 @@ router_choose_random_node(smartlist_t *excludedsmartlist, }); } - if ((r = routerlist_find_my_routerinfo())) + /* If the node_t is not found we won't be to exclude ourself but we + * won't be able to pick ourself in router_choose_random_node() so + * this is fine to at least try with our routerinfo_t object. */ + if ((r = router_get_my_routerinfo())) routerlist_add_node_and_family(excludednodes, r); router_add_running_nodes_to_smartlist(sl, allow_invalid, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.8] version bump to 0.2.8.17
commit 6ee44725449794951f93020bb04e5fa3ba784742
Author: Nick Mathewson
Date: Thu Nov 30 12:22:32 2017 -0500
version bump to 0.2.8.17
---
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 6fb101bf9..94cebf401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.16-dev])
+AC_INIT([tor],[0.2.8.17])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index b9eac37c5..b9076fbc7 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.2.8.16-dev"
+!define VERSION "0.2.8.17"
!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 211243d1d..9db6ef209 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.8.16-dev"
+#define VERSION "0.2.8.17"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.5] Avoid asking for passphrase on junky PEM input
commit 1880a6a88e240556a8e6b169f1160aa8220ab0ec
Author: Nick Mathewson
Date: Sat Nov 11 14:21:37 2017 -0500
Avoid asking for passphrase on junky PEM input
Fixes bug 24246 and TROVE-2017-011.
This bug is so old, it's in Matej's code. Seems to have been
introduced with e01522bbed6eea.
---
changes/trove-2017-011 | 8
src/common/crypto.c| 16 +---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/changes/trove-2017-011 b/changes/trove-2017-011
new file mode 100644
index 0..82d20d9e7
--- /dev/null
+++ b/changes/trove-2017-011
@@ -0,0 +1,8 @@
+ o Major bugfixes (security):
+- Fix a denial of service bug where an attacker could use a malformed
+ directory object to cause a Tor instance to pause while OpenSSL would
+ try to read a passphrase from the terminal. (If the terminal was not
+ available, tor would continue running.) Fixes bug 24246; bugfix on
+ every version of Tor. Also tracked as TROVE-2017-011 and
+ CVE-2017-8821. Found by OSS-Fuzz as testcase 6360145429790720.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index f7362765d..8d816652d 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -592,11 +592,21 @@ crypto_pk_generate_key_with_bits(crypto_pk_t *env, int
bits)
return 0;
}
+/** A PEM callback that always reports a failure to get a password */
+static int
+pem_no_password_cb(char *buf, int size, int rwflag, void *u)
+{
+ (void)buf;
+ (void)size;
+ (void)rwflag;
+ (void)u;
+ return 0;
+}
+
/** Read a PEM-encoded private key from the len-byte string s
* into env. Return 0 on success, -1 on failure. If len is -1,
* the string is nul-terminated.
*/
-/* Used here, and used for testing. */
int
crypto_pk_read_private_key_from_string(crypto_pk_t *env,
const char *s, ssize_t len)
@@ -615,7 +625,7 @@ crypto_pk_read_private_key_from_string(crypto_pk_t *env,
if (env->key)
RSA_free(env->key);
- env->key = PEM_read_bio_RSAPrivateKey(b,NULL,NULL,NULL);
+ env->key = PEM_read_bio_RSAPrivateKey(b,NULL,pem_no_password_cb,NULL);
BIO_free(b);
@@ -747,7 +757,7 @@ crypto_pk_read_public_key_from_string(crypto_pk_t *env,
const char *src,
if (env->key)
RSA_free(env->key);
- env->key = PEM_read_bio_RSAPublicKey(b, NULL, NULL, NULL);
+ env->key = PEM_read_bio_RSAPublicKey(b, NULL, pem_no_password_cb, NULL);
BIO_free(b);
if (!env->key) {
crypto_log_errors(LOG_WARN, "reading public key from string");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.8] Use local descriptor object to exclude self in path selection
commit 6ab07419c88e35c6d8610e20fb3cea16e39c8acd Author: David Goulet Date: Tue Nov 28 19:02:00 2017 -0500 Use local descriptor object to exclude self in path selection TROVE-2017-12. Severity: Medium When choosing a random node for a circuit, directly use our router descriptor to exclude ourself instead of the one in the global descriptor list. That list could be empty because tor could be downloading them which could lead to not excluding ourself. Closes #21534 --- changes/trove-2017-012-part1 | 6 ++ src/or/routerlist.c | 5 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/trove-2017-012-part1 b/changes/trove-2017-012-part1 new file mode 100644 index 0..9fccc2cf6 --- /dev/null +++ b/changes/trove-2017-012-part1 @@ -0,0 +1,6 @@ + o Major bugfixes (security, relay): +- When running as a relay, make sure that we never build a path through + ourselves, even in the case where we have somehow lost the version of + our descriptor appearing in the consensus. Fixes part of bug 21534; + bugfix on 0.2.0.1-alpha. This issue is also tracked as TROVE-2017-012 + and CVE-2017-8822. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 07e87724b..3bf1eb895 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2411,7 +2411,10 @@ router_choose_random_node(smartlist_t *excludedsmartlist, }); } - if ((r = routerlist_find_my_routerinfo())) + /* If the node_t is not found we won't be to exclude ourself but we + * won't be able to pick ourself in router_choose_random_node() so + * this is fine to at least try with our routerinfo_t object. */ + if ((r = router_get_my_routerinfo())) routerlist_add_node_and_family(excludednodes, r); router_add_running_nodes_to_smartlist(sl, allow_invalid, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.5] bump to 0.2.5.16
commit 6bda6777c1e86a54dedafd1fadd6142b1ff4955a
Author: Nick Mathewson
Date: Thu Nov 30 12:19:48 2017 -0500
bump to 0.2.5.16
---
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 317778275..67fddd7b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2013, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.5.15-dev])
+AC_INIT([tor],[0.2.5.16])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in
b/contrib/win32build/tor-mingw.nsi.in
index 6dc7cbd76..c88262afa 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.2.5.15-dev"
+!define VERSION "0.2.5.16"
!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 5ba3ec194..87ba1f11a 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.5.15-dev"
+#define VERSION "0.2.5.16"
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8
commit 2e219291bee2d378344286ba091ba09527b07188 Merge: ba4a9cf0c 6bda6777c Author: Nick Mathewson Date: Thu Nov 30 12:21:36 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.5] Merge branch 'trove-2017-009_025' into maint-0.2.5
commit a6a0c7a4ecc22a744b123a47d466963f6023a11f Merge: 831d3b794 75509dc82 Author: Nick Mathewson Date: Thu Nov 30 12:05:59 2017 -0500 Merge branch 'trove-2017-009_025' into maint-0.2.5 changes/trove-2017-009 | 10 ++ src/or/rendservice.c | 4 +++- 2 files changed, 13 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/maint-0.2.5] Fix changes file
commit 75509dc82778a3bb866dca0fa86ae3e179ad78fa Author: Nick Mathewson Date: Thu Nov 30 11:52:40 2017 -0500 Fix changes file --- changes/trove-2017-009 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/trove-2017-009 b/changes/trove-2017-009 index 512d18c29..166a5faec 100644 --- a/changes/trove-2017-009 +++ b/changes/trove-2017-009 @@ -1,4 +1,4 @@ - o Major fixes (security): + o Major bugfixes (security): - When checking for replays in the INTRODUCE1 cell data for a (legacy) hiddden service, correctly detect replays in the RSA-encrypted part of the cell. We were previously checking for replays on the entire cell, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.5] Merge branch 'trove-2017-011_025' into maint-0.2.5
commit 08ce39fb0fd50ab0da4201201fa07e7776cb09e7 Merge: a6a0c7a4e 1880a6a88 Author: Nick Mathewson Date: Thu Nov 30 12:06:17 2017 -0500 Merge branch 'trove-2017-011_025' into maint-0.2.5 changes/trove-2017-011 | 8 src/common/crypto.c| 16 +--- 2 files changed, 21 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.8] Merge branch 'trove-2017-011_025' into maint-0.2.5
commit 08ce39fb0fd50ab0da4201201fa07e7776cb09e7 Merge: a6a0c7a4e 1880a6a88 Author: Nick Mathewson Date: Thu Nov 30 12:06:17 2017 -0500 Merge branch 'trove-2017-011_025' into maint-0.2.5 changes/trove-2017-011 | 8 src/common/crypto.c| 16 +--- 2 files changed, 21 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8
commit ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e Merge: 3030741b5 f49876d66 Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/trove-2017-009 | 10 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/rendservice.c | 4 +++- src/or/routerlist.c | 5 - 6 files changed, 44 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.5] Merge branch 'trove-2017-012_025' into maint-0.2.5
commit f49876d66efbc5679ba7d9d9c6538c763b8e06b5 Merge: 08ce39fb0 6ab07419c Author: Nick Mathewson Date: Thu Nov 30 12:06:21 2017 -0500 Merge branch 'trove-2017-012_025' into maint-0.2.5 changes/trove-2017-012-part1 | 6 ++ src/or/routerlist.c | 5 - 2 files changed, 10 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
