October 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 98e14720b5bc30a7cf9af15a1f618ddce0922ef9 Merge: 968b6c30c1 165a92e33f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:14:46 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5 changes/log_32868 | 4 +++ src/feature/nodelist/node_select.c | 54 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 225d255fdc1b8edf96b1c8fb72c5479c220d4112 Merge: 02f8852386 a49373844c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit a49373844cd3c7047759244a6a5c103304d88a7b Merge: 9587512578 98e14720b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 026eeff1ac736fcfdb2690b498fa947efcd790a7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:16:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sw.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sw.po b/sw.po index 4fd6c478ca..8deece7a4c 100644 --- a/sw.po +++ b/sw.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-07 11:45+0000\n" +"PO-Revision-Date: 2020-10-07 12:14+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -675,7 +675,7 @@ msgstr "inapangilia taarifa kwenye diski" msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "" +msgstr "Hitilafu: haiwezi kupanga lebo au kuchukua UUID ya kifaa chako. haiwezi kuendelea." #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:184 #, python-format @@ -684,7 +684,7 @@ msgstr "imekamilisha kusikanisha (%s)" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:189 msgid "Tails installation failed!" -msgstr "" +msgstr "Usakinisha wa muda mrefu umeshindwa." #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:281 #: ../config/chroot_local-includes/usr/share/applications/tails-installer.desktop.in.h:1 @@ -699,16 +699,16 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:331 #: ../config/chroot_local-includes/usr/share/tails-installer/tails-installer.ui.in:184 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "Tumia ISO ya picha iliyopakuliwa" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:368 #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:671 msgid "Upgrade" -msgstr "" +msgstr "Kuboresha" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:370 msgid "Manual Upgrade Instructions" -msgstr "" +msgstr "maelekezo ya kukuongoza wakati wa kuboresha" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:372 msgid "https://tails.boum.org/upgrade/" @@ -733,11 +733,11 @@ msgstr "https://tails.boum.org/install/" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:391 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s kifaa (%(device)s)" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:403 msgid "No ISO image selected" -msgstr "" +msgstr "Hakuna picha ya ISO iliyochaguliwa" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:404 msgid "Please select a Tails ISO image." @@ -765,7 +765,7 @@ msgstr "" msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "" +msgstr "kifaa \"%(pretty_name)s\" ni kidogo sana kuweza kupakia ( angalau %(size)s GB inahitajika)" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:505 #, python-format @@ -776,11 +776,11 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:526 msgid "An error happened while installing Tails" -msgstr "" +msgstr "Kosa limejitokeza wakati wa kupakia" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:578 msgid "Installation complete!" -msgstr "" +msgstr "imekamilika usakinishaji" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:630 msgid "Unable to mount device" @@ -789,7 +789,7 @@ msgstr "Haiwezi kuunganisha kifaa" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:637 #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:670 msgid "Confirm the target USB stick" -msgstr "" +msgstr "Hakikisha USB iliyokusudiwa " #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:638 #, python-format @@ -797,12 +797,12 @@ msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" "\n" "All data on this USB stick will be lost." -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s kifaa (%(device)s)" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:657 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s kifaa cha kielekitroniki (%(device)s)" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:665 msgid "" @@ -1850,7 +1850,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:114 msgid "Name of the affected software" -msgstr "" +msgstr "Majina yalio athiriwa na softi wea" #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:116 msgid "Exact steps to reproduce the error" @@ -1862,7 +1862,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:120 msgid "Desired result" -msgstr "" +msgstr "Matokeo pendwa" #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:133 msgid "Unable to load a valid configuration."

1 0

[translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 0aa5bf319657c509893ea84d5d660d4d80cb4cf9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:15:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- sw/strings.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sw/strings.xml b/sw/strings.xml index 1cd9ac489d..0f85849f4c 100644 --- a/sw/strings.xml +++ b/sw/strings.xml @@ -1,6 +1,10 @@ <resources> + <string name="app_name">OrfoxRIP</string> <string name="try_tor_browser">Jaribu kivinjari cha Tor</string> + <string name="orfox_is_now_tor_browser">Orfox kwa sasa ni kivinjari cha Tor kwa Android.</string> <string name="get_it">Pata kutoka chanzo ukipendacho:</string> + <string name="go_to_f_droid">NENDA KWA F-DROID</string> <string name="go_to_google_play">Nenda Google Play</string> <string name="download_apk">Pakua APK</string> - </resources> + <string name="export_bookmarks">Maalamisho ya kuuza nje</string> +</resources>

1 0

[translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit e1add5761391fe51db08609dac63aaec7e273b3f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:15:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- sw/sw.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index c5b52c62ec..5ca846d5a8 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 13:54+0200\n" -"PO-Revision-Date: 2020-10-07 11:45+0000\n" +"PO-Revision-Date: 2020-10-07 12:11+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -268,23 +268,23 @@ msgstr "Haiwezi kutafuta" msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "" +msgstr "hakikisha ili kuchukua sakinishi ya faili lililofungwa kabla ya kutumia programu hii." #: ../tails_installer/gui.py:69 #, python-format msgid "Unknown release: %s" -msgstr "" +msgstr "imetolewa isiyojulikana: %s" #: ../tails_installer/gui.py:73 #, python-format msgid "Downloading %s..." -msgstr "Upakuaji %s..." +msgstr "Inapakua %s..." #: ../tails_installer/gui.py:213 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "" +msgstr "Hitilafu: haiwezi kupanga lebo au kuchukua UUID ya kifaa chako. haiwezi kuendelea." #: ../tails_installer/gui.py:260 #, python-format @@ -293,7 +293,7 @@ msgstr "imekamilisha kusikanisha (%s)" #: ../tails_installer/gui.py:265 msgid "Tails installation failed!" -msgstr "" +msgstr "Usakinisha wa muda mrefu umeshindwa." #: ../tails_installer/gui.py:369 msgid "" @@ -325,15 +325,15 @@ msgstr "" #: ../tails_installer/gui.py:457 ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "Tumia ISO ya picha iliyopakuliwa" #: ../tails_installer/gui.py:494 ../tails_installer/gui.py:815 msgid "Upgrade" -msgstr "" +msgstr "Kuboresha" #: ../tails_installer/gui.py:496 msgid "Manual Upgrade Instructions" -msgstr "" +msgstr "maelekezo ya kukuongoza wakati wa kuboresha" #: ../tails_installer/gui.py:498 msgid "https://tails.boum.org/upgrade/" @@ -355,11 +355,11 @@ msgstr "https://tails.boum.org/install/" #: ../tails_installer/gui.py:517 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s kifaa (%(device)s)" #: ../tails_installer/gui.py:529 msgid "No ISO image selected" -msgstr "" +msgstr "Hakuna picha ya ISO iliyochaguliwa" #: ../tails_installer/gui.py:530 msgid "Please select a Tails ISO image." @@ -387,7 +387,7 @@ msgstr "" msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "" +msgstr "kifaa \"%(pretty_name)s\" ni kidogo sana kuweza kupakia ( angalau %(size)s GB inahitajika)" #: ../tails_installer/gui.py:631 #, python-format @@ -398,7 +398,7 @@ msgstr "" #: ../tails_installer/gui.py:652 msgid "An error happened while installing Tails" -msgstr "" +msgstr "Kosa limejitokeza wakati wa kupakia" #: ../tails_installer/gui.py:664 msgid "Refreshing releases..." @@ -406,11 +406,11 @@ msgstr "" #: ../tails_installer/gui.py:669 msgid "Releases updated!" -msgstr "" +msgstr "uboreshwaji ulioachiliwa" #: ../tails_installer/gui.py:722 msgid "Installation complete!" -msgstr "" +msgstr "imekamilika usakinishaji" #: ../tails_installer/gui.py:738 msgid "Cancel" @@ -422,7 +422,7 @@ msgstr "Haiwezi kuunganisha kifaa" #: ../tails_installer/gui.py:781 ../tails_installer/gui.py:814 msgid "Confirm the target USB stick" -msgstr "" +msgstr "Hakikisha USB iliyokusudiwa " #: ../tails_installer/gui.py:782 #, python-format @@ -430,12 +430,12 @@ msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" "\n" "All data on this USB stick will be lost." -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s kifaa (%(device)s)" #: ../tails_installer/gui.py:801 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s kifaa cha kielekitroniki (%(device)s)" #: ../tails_installer/gui.py:809 msgid "" @@ -447,7 +447,7 @@ msgstr "" #: ../tails_installer/gui.py:810 #, python-format msgid "%(description)s%(persistence_message)s" -msgstr "" +msgstr "%(description)s%(persistence_message)s" #: ../tails_installer/gui.py:853 msgid "Download complete!"

1 0

[translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit a8d07042614f471de1fafde31a43c21805ef1b0a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:15:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- sw/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/exonerator.properties b/sw/exonerator.properties index dede7878f3..41186e18c3 100644 --- a/sw/exonerator.properties +++ b/sw/exonerator.properties @@ -43,7 +43,7 @@ technicaldetails.exit.yes=Ndio technicaldetails.exit.no=hapana permanentlink.heading=Kiungo cha kudumu footer.abouttor.heading=Kuhusu Tor -footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by encrypting packets and sending them through a series of hops before they reach their destination.  Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator.  The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin.  Be sure to %s, and don't hesitate to %s for more information. +footer.abouttor.body.text=Tor ni mradi wa programu ya kimataifa kwa kuficha wavuti ya trafiki kwa kusimba pakiti na kuzituma kupitia mfululizo wa hop kabla kufikia mwishilio wao.  Kwahiyo, kama ukiona trafiki kutoka Tor inayopelekea, trafiki hii mara nyingi hutoka kwa mtu anae tumia Tor,badala ya kutoka kwa kuendana na opareta.  Mradi wa Tor na kuendana kwa Tor operata hakuna rekodi ya trafiki ambayo imepitia mpaka kwenye mtandao na kwahiyo haiwezi kutoa taarifa yeyote kuhusu asili yake.  kuwa nauhakika kwa %s, na usisite kwa %s kwa taarifa zaidi. footer.abouttor.body.link1=Jifunze zaidi kuhusu Tor footer.abouttor.body.link2=Wasiliana na mradi wa Tor, Inc. footer.aboutexonerator.heading=Kuhusu ExoneraTor

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 9d2e71200b598094f18db4d69ace1b5ea0af7099 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:15:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 4ce74ac9c7..30350c915c 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-10-07 06:53+0000\n" +"PO-Revision-Date: 2020-10-07 12:12+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -207,7 +207,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "DarajaDB linatoa madaraja mengi %s yanayoweza kuziba usafiri %s, \n ambao unasaidia obfscate miunganiko yako ya Tor mtandaoni, fanya zaidi \nugumu kwa yeyote anayeangalia mtandao wako trafiki amua kutumia \nTor\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:57 @@ -215,7 +215,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "Baadhi ya madaraja ya IPv6 anuani pia inapatikana, kupitia baadhi ya vikwazo \nusafiri IPv6 kwenda sawa\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -229,7 +229,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "Kwa kuongeza, DarajaDB ina mengi wazi-ol'-vanilla madaraja %s bila kikwazo chochote cha usafiri %s ambayo haiwezi kuwa sawa, lakini inabaki \n kusaidia kuzunguka utdibiti mtandao mara nyingi\n" #: bridgedb/strings.py:78 bridgedb/test/test_https.py:356 msgid "What are bridges?" @@ -265,7 +265,7 @@ msgstr "Madaraja yangu hayafanyi kazi! Ninahitaji msaada!" #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "Kama kivinjari cha Tor hakiwezi kuunganisha, tafadhali angalia kwenye %s na yetu %s." #: bridgedb/strings.py:102 msgid "Here are your bridge lines:"

1 0

[tor/maint-0.3.5] NSS: Tell NSS that our SSL sockets are nonblocking.
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 40eb6b19a33f1261168e5d64ba162d6f7d80e5a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 13:14:33 2020 -0400 NSS: Tell NSS that our SSL sockets are nonblocking. Closes ticket 40035. --- changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40035 b/changes/ticket40035 new file mode 100644 index 0000000000..8cdd447199 --- /dev/null +++ b/changes/ticket40035 @@ -0,0 +1,5 @@ + o Major bugfixes (NSS): + - When running with NSS enabled, make sure that NSS knows to expect + nonblocking sockets. Previously, we set our TCP sockets as blocking, + but did not tell NSS about the fact, which in turn could lead to + unexpected blocking behavior. Fixes bug 40035; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 1436442e1c..6f6c47674e 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -418,6 +418,16 @@ tor_tls_new(tor_socket_t sock, int is_server) return NULL; } + /* even if though the socket is already nonblocking, we need to tell NSS + * about the fact, so that it knows what to do when it says EAGAIN. */ + PRSocketOptionData data; + data.option = PR_SockOpt_Nonblocking; + data.value.non_blocking = 1; + if (PR_SetSocketOption(ssl, &data) != PR_SUCCESS) { + PR_Close(ssl); + return NULL; + } + tor_tls_t *tls = tor_malloc_zero(sizeof(tor_tls_t)); tls->magic = TOR_TLS_MAGIC; tls->context = ctx;

1 0

[tor/maint-0.4.3] NSS: Tell NSS that our SSL sockets are nonblocking.
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 40eb6b19a33f1261168e5d64ba162d6f7d80e5a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 13:14:33 2020 -0400 NSS: Tell NSS that our SSL sockets are nonblocking. Closes ticket 40035. --- changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40035 b/changes/ticket40035 new file mode 100644 index 0000000000..8cdd447199 --- /dev/null +++ b/changes/ticket40035 @@ -0,0 +1,5 @@ + o Major bugfixes (NSS): + - When running with NSS enabled, make sure that NSS knows to expect + nonblocking sockets. Previously, we set our TCP sockets as blocking, + but did not tell NSS about the fact, which in turn could lead to + unexpected blocking behavior. Fixes bug 40035; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 1436442e1c..6f6c47674e 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -418,6 +418,16 @@ tor_tls_new(tor_socket_t sock, int is_server) return NULL; } + /* even if though the socket is already nonblocking, we need to tell NSS + * about the fact, so that it knows what to do when it says EAGAIN. */ + PRSocketOptionData data; + data.option = PR_SockOpt_Nonblocking; + data.value.non_blocking = 1; + if (PR_SetSocketOption(ssl, &data) != PR_SUCCESS) { + PR_Close(ssl); + return NULL; + } + tor_tls_t *tls = tor_malloc_zero(sizeof(tor_tls_t)); tls->magic = TOR_TLS_MAGIC; tls->context = ctx;

1 0