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

[tor-messenger-build/master] Enable content process sandbox on Windows
by arlo＠torproject.org 23 Oct '17

23 Oct '17

commit 4b91bfe6b84b508ae80538e12593bceaffe842c4 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Oct 23 10:58:40 2017 -0400 Enable content process sandbox on Windows --- ChangeLog | 2 ++ projects/instantbird/mozconfig-windows-i686 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c34e3f..16921c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ Tor Messenger 0.5.0b2 -- * Trac 23542: Add snowflake pt * Mac * Trac 23542: Add snowflake pt + * Windows + * Trac 16010: Enable the content process sandbox on Windows Tor Messenger 0.5.0b1 -- September 28, 2017 * All Platforms diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index f8e335d..bca7c2c 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -7,7 +7,3 @@ ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-strip - -# We can't build the sandbox code with mingw-w64: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 -ac_add_options --disable-sandbox

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Oct '17

23 Oct '17

commit 211e1b9266b0ae3b9d8a3ccf46c720a3bc06e167 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 23 14:46:05 2017 +0000 Update translations for liveusb-creator --- nn/nn.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index abc268b03..cbc3dfc09 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016-2017 # Finn Brudal <finnbrudal(a)yahoo.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-21 01:33+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-10-23 14:41+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,7 +126,7 @@ msgstr "Ustøtta filsystem: %s" #: ../tails_installer/creator.py:788 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Ukjend GLib-unnatak under freistnad på montering av: %(message)s" #: ../tails_installer/creator.py:792 #, python-format @@ -192,7 +192,7 @@ msgstr "Installerer støvellastar..." #: ../tails_installer/creator.py:1043 #, python-format msgid "Could not find the '%s' COM32 module" -msgstr "" +msgstr "Klarte ikkje å finne '%s' COM32-modulen" #: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432 #, python-format @@ -215,17 +215,17 @@ msgstr "Formaterer %(device)s som FAT32" #: ../tails_installer/creator.py:1266 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "Klarte ikkje å finne syslinux' gptmbr.bin" #: ../tails_installer/creator.py:1279 #, python-format msgid "Reading extracted MBR from %s" -msgstr "" +msgstr "Les utpakka MBR frå %s" #: ../tails_installer/creator.py:1283 #, python-format msgid "Could not read the extracted MBR from %(path)s" -msgstr "" +msgstr "Klarte ikkje å lese utpakka MBR frå %(path)s" #: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297 #, python-format @@ -318,24 +318,24 @@ msgstr "" #: ../tails_installer/gui.py:454 msgid "Upgrade" -msgstr "" +msgstr "Oppgrader" #: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7 msgid "Install" -msgstr "" +msgstr "Installer" #: ../tails_installer/gui.py:465 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s eining (%(device)s)" #: ../tails_installer/gui.py:476 msgid "No ISO image selected" -msgstr "" +msgstr "ISO bilde ikkje valt" #: ../tails_installer/gui.py:477 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "Vel eit Tails ISO-bilde." #: ../tails_installer/gui.py:516 msgid "No device suitable to install Tails could be found" @@ -379,7 +379,7 @@ msgstr "Installering fullførd" #: ../tails_installer/gui.py:644 msgid "Installation was completed." -msgstr "" +msgstr "Installeringa fullført." #: ../tails_installer/gui.py:693 msgid "Unable to mount device" @@ -492,7 +492,7 @@ msgstr "" #: ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" -msgstr "" +msgstr "Klon gjeldande Tails" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" @@ -508,4 +508,4 @@ msgstr "" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)" -msgstr "" +msgstr "Installer på nytt (slett alle dataa)"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 23 Oct '17

23 Oct '17

commit 477c06550a3d2e1c6a190e3a92710bc5be739dc0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 23 14:45:58 2017 +0000 Update translations for https_everywhere_completed --- nn/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index a8829b394..e62f9a886 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -11,6 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> <!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane"> +<!ENTITY https-everywhere.options.generalSettings "Generelle innstillingar"> <!ENTITY https-everywhere.options.importSettings "Importer innstillingar"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Innstillingane dine er importerte">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Oct '17

23 Oct '17

commit 82f156db2937890c94c6ce2ad5f00c8e5aecac7e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 23 14:45:46 2017 +0000 Update translations for https_everywhere --- nn/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index 2e1e2d9e6..e62f9a886 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> <!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> +<!ENTITY https-everywhere.options.generalSettings "Generelle innstillingar"> <!ENTITY https-everywhere.options.importSettings "Importer innstillingar"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Innstillingane dine er importerte">

1 0

[tor-messenger-build/master] Bump tor-browser-build to 9b4ba82
by arlo＠torproject.org 23 Oct '17

23 Oct '17

commit 4ff1d64dc1f9ae732978d319987bb7e7f3aed010 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Oct 23 10:33:46 2017 -0400 Bump tor-browser-build to 9b4ba82 --- ChangeLog | 4 ++-- projects/instantbird/mozconfig-osx-x86_64 | 3 ++- rbm.conf | 2 +- tor-browser-build | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb9d4ce..7c34e3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ -Tor Messenger 0.5.0b2 -- +Tor Messenger 0.5.0b2 -- * All Platforms * Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52 * Update tor-browser to 7.0.6 - * Update tor-browser-build to 8c4c05d + * Update tor-browser-build to 9b4ba82 * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH * Trac 23542: Add snowflake pt diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 21154f5..cd1c4ef 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -5,7 +5,8 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" +HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" diff --git a/rbm.conf b/rbm.conf index 5f793b2..e5938e4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -310,7 +310,7 @@ ENV: # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^runc version spec: 1\.0\.0$/; + return $out =~ m/^spec: 1\.0\.0$/m; }, }, ) diff --git a/tor-browser-build b/tor-browser-build index 8c4c05d..9b4ba82 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit 8c4c05ddcfc30107b967b204d491523685460226 +Subproject commit 9b4ba8252a80fb10ca9fc22e90033d63383ac05d

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3 Merge: 6a7aa4735 af33fdd7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:22:43 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

1 0

[tor/maint-0.3.2] Remove the length limit from write_http_status_line
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:21:22 2017 -0400 Remove the length limit from write_http_status_line Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin failure message really long. Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d, where arma said "get rid of the scary 256-byte-buf landmine". --- changes/bug23908 | 3 +++ src/or/directory.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug23908 b/changes/bug23908 new file mode 100644 index 000000000..f641b66bb --- /dev/null +++ b/changes/bug23908 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha): + - Remove the length limit on HTTP status lines that authorities can send + in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc. diff --git a/src/or/directory.c b/src/or/directory.c index 45fbd1dd3..bef65d349 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3282,14 +3282,12 @@ static void write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { - char buf[256]; - if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n", - status, reason_phrase ? reason_phrase : "OK") < 0) { - log_warn(LD_BUG,"status line too long."); - return; - } + char *buf = NULL; + tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n\r\n", + status, reason_phrase ? reason_phrase : "OK"); log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase); connection_write_to_buf(buf, strlen(buf), TO_CONN(conn)); + tor_free(buf); } /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,

1 0

[tor/master] Remove the length limit from write_http_status_line
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:21:22 2017 -0400 Remove the length limit from write_http_status_line Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin failure message really long. Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d, where arma said "get rid of the scary 256-byte-buf landmine". --- changes/bug23908 | 3 +++ src/or/directory.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug23908 b/changes/bug23908 new file mode 100644 index 000000000..f641b66bb --- /dev/null +++ b/changes/bug23908 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha): + - Remove the length limit on HTTP status lines that authorities can send + in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc. diff --git a/src/or/directory.c b/src/or/directory.c index 45fbd1dd3..bef65d349 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3282,14 +3282,12 @@ static void write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { - char buf[256]; - if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n", - status, reason_phrase ? reason_phrase : "OK") < 0) { - log_warn(LD_BUG,"status line too long."); - return; - } + char *buf = NULL; + tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n\r\n", + status, reason_phrase ? reason_phrase : "OK"); log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase); connection_write_to_buf(buf, strlen(buf), TO_CONN(conn)); + tor_free(buf); } /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3 Merge: 6a7aa4735 af33fdd7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:22:43 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

1 0

[tor/release-0.3.1] Remove the length limit from write_http_status_line
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:21:22 2017 -0400 Remove the length limit from write_http_status_line Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin failure message really long. Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d, where arma said "get rid of the scary 256-byte-buf landmine". --- changes/bug23908 | 3 +++ src/or/directory.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug23908 b/changes/bug23908 new file mode 100644 index 000000000..f641b66bb --- /dev/null +++ b/changes/bug23908 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha): + - Remove the length limit on HTTP status lines that authorities can send + in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc. diff --git a/src/or/directory.c b/src/or/directory.c index 45fbd1dd3..bef65d349 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3282,14 +3282,12 @@ static void write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { - char buf[256]; - if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n", - status, reason_phrase ? reason_phrase : "OK") < 0) { - log_warn(LD_BUG,"status line too long."); - return; - } + char *buf = NULL; + tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n\r\n", + status, reason_phrase ? reason_phrase : "OK"); log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase); connection_write_to_buf(buf, strlen(buf), TO_CONN(conn)); + tor_free(buf); } /** Write the header for an HTTP/1.0 response onto conn-\>outbuf,

1 0