March 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit 55e1fe874de322a280dd8e2dfb92407360aad14e Merge: 6a8550f c5c4ea2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:20:01 2015 +0100 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.2.6] Add wait4 to the seccomp2 sandbox allowable syscall list
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit d5b2cbea106e020436d577e42672d281400558dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:18:10 2015 +0100 Add wait4 to the seccomp2 sandbox allowable syscall list fixes bug 15088. patch from sanic. --- changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug15088 b/changes/bug15088 new file mode 100644 index 0000000..95878bd --- /dev/null +++ b/changes/bug15088 @@ -0,0 +1,4 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - Upon receiving sighup, do not crash during attempts to call + wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from + "sanic". diff --git a/src/common/sandbox.c b/src/common/sandbox.c index dbbaa59..e43b64b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -164,6 +164,7 @@ static int filter_nopar_gen[] = { #endif SCMP_SYS(stat), SCMP_SYS(uname), + SCMP_SYS(wait4), SCMP_SYS(write), SCMP_SYS(writev), SCMP_SYS(exit_group),

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit c5c4ea2db0411ac1e5f3abd6ca8fa4ae322ee906 Merge: 5ad47aa d5b2cbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:19:28 2015 +0100 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6 changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 04 Mar '15

04 Mar '15

commit 004ca5a41c228e5b4e895dcb11a4aba6e4b18363 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 4 11:17:56 2015 +0000 Update translations for tails-misc --- hu.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hu.po b/hu.po index def679b..c86740b 100644 --- a/hu.po +++ b/hu.po @@ -7,14 +7,14 @@ # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # iskr <iscreamd(a)gmail.com>, 2013 # Lajos Pasztor <mrlajos(a)gmail.com>, 2014 -# vargaviktor <viktor.varga(a)gmail.com>, 2013 +# vargaviktor <viktor.varga(a)gmail.com>, 2013,2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-04 11:17+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +45,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "" +msgstr "<h1>Segítsen kijavítani a hibát!</h1>\n<p>Olvassa el <a href=\"%s\">hibabejelentési útmutatót</a>.</p>\n<p><strong>Kérjük a szükségesnél több személyes információt ne adjon meg!</strong></p>\n<h2>Az email címe megadásáról</h2>\n<p>\nHa megadja nekünk az email címét, fel tudjuk venni a kapcsolatot a probléma tisztázásához. Az esetek többségében ez a legtöbb hibabejelentéshez szükséges, a hibabejelentés többsége sajnos e nélkül használhatatlan.\n\nA másik oldalról nézve ez lehetővé teszi egy lehallgatónak, legyen ez email lehallgató, vagy ISP hogy megtudja hogy használja a Tails-t.\n</p>\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" @@ -447,7 +447,7 @@ msgstr "Sikertelen a chroot beállítása." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 msgid "Failed to configure browser." -msgstr "" +msgstr "Sikertelen a böngésző beállítása." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 msgid "Failed to run browser."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 04 Mar '15

04 Mar '15

commit 169b286543acfcc24d9eeddec683334a233a119a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 4 11:15:21 2015 +0000 Update translations for bridgedb_completed --- hu/LC_MESSAGES/bridgedb.po | 55 +++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index c6443fd..5f352bb 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -1,20 +1,20 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # Lajos Pasztor <mrlajos(a)gmail.com>, 2014 # Cerbo <taiurin(a)gmail.com>, 2014 -# vargaviktor <viktor.varga(a)gmail.com>, 2013 +# vargaviktor <viktor.varga(a)gmail.com>, 2013,2015 # vargaviktor <viktor.varga(a)gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-31 02:23+0000\n" -"Last-Translator: Lajos Pasztor <mrlajos(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-04 11:11+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Elnézést! Valami rosszul működött a kérésed közben." @@ -77,7 +77,7 @@ msgstr "Hé, %s!" msgid "Hello, friend!" msgstr "Hello!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "Nyilvános kulcsok" @@ -258,35 +258,58 @@ msgstr "Egy csatlakoztatható szállító kérelme TYPE szerint." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Másolat szertése a BridgeDB's publikus GnuPG kulcsából." -#: lib/bridgedb/templates/base.html:92 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Hiba jelentése" -#: lib/bridgedb/templates/base.html:94 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Forrás kód" -#: lib/bridgedb/templates/base.html:97 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Változások" -#: lib/bridgedb/templates/base.html:99 +#: lib/bridgedb/templates/base.html:98 msgid "Contact" msgstr "Kapcsolat" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Mindent kijelöl" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "QR Kód megjelenítése" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QR Kód a híd sorokhoz" + #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Hoppá!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Úgytűnik a QR Kód hibás." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Ez a QR Kód a híd sorait tartalmazza. Olvassa be egy QR Kód olvasóval, hogy átmásolja a Híd sorokat mobil és egyéb eszközeire." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Jelenleg nincsenek rendelkezésre álló hidak..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -347,7 +370,7 @@ msgstr "Semmi" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sS%szeretnék!" @@ -355,7 +378,7 @@ msgstr "%sS%szeretnék!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sS%szerezni Bridge -et!"

1 0

[tor/master] Use configured Python binary in test-stem.
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit 334f74f6f123411c74cfd4c8614e40110c34690a Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Feb 26 10:38:09 2015 +0100 Use configured Python binary in test-stem. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 67c9cc9..b1f92f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,7 @@ test-network: all test-stem: $(TESTING_TOR_BINARY) @if test -d "$$STEM_SOURCE_DIR"; then \ - "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; \ + $(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; \ else \ echo '$$STEM_SOURCE_DIR was not set.'; echo; \ echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \

1 0

[tor/master] changes file for 15037
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit 0f2f8fd68a54707bb256b446cff524f0e1ef1658 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 26 15:24:43 2015 -0500 changes file for 15037 --- changes/bug15037 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug15037 b/changes/bug15037 new file mode 100644 index 0000000..587d631 --- /dev/null +++ b/changes/bug15037 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - When running the new 'make test-stem' target, use the configured + python binary. Fixes bug 15037; bugfix on 0.2.6.3-alpha. Patch + from "cypherpunks".

1 0

[tor/master] Missing dependencies; fixes 15127.
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:09:33 2015 +0100 Missing dependencies; fixes 15127. --- changes/bug15127 | 3 +++ src/common/include.am | 1 + src/or/include.am | 1 + 3 files changed, 5 insertions(+) diff --git a/changes/bug15127 b/changes/bug15127 new file mode 100644 index 0000000..642dc02 --- /dev/null +++ b/changes/bug15127 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Add missing dependencies to fix compilation on BSD. Patch from + Peter Palfrader. Fixes bug 15127; bugfix on 0.2.5.1-alpha. diff --git a/src/common/include.am b/src/common/include.am index 68e0110..06d94f9 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -139,4 +139,5 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA fi src/common/util_codedigest.o: src/common/common_sha1.i +src/common/src_common_libor_testing_a-util_codedigest.o: src/common/common_sha1.i diff --git a/src/or/include.am b/src/or/include.am index 47bdd09..2e46f8a 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -191,6 +191,7 @@ ORHEADERS = \ noinst_HEADERS+= $(ORHEADERS) micro-revision.i src/or/config_codedigest.o: src/or/or_sha1.i +src/or/src_or_libtor_testing_a-config_codedigest.o: src/or/or_sha1.i micro-revision.i: FORCE @rm -f micro-revision.tmp; \

1 0

[tor/master] only declare rv when it is used in destination_from_socket. Fixes 15151
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit 2d926d0147af8c632fe389e770c5832009f2ddc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:12:41 2015 +0100 only declare rv when it is used in destination_from_socket. Fixes 15151 --- changes/bug15151 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug15151 b/changes/bug15151 new file mode 100644 index 0000000..b9c3061 --- /dev/null +++ b/changes/bug15151 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on + 0.2.6.2-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3c817de..e6dfc63 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1598,7 +1598,6 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) struct sockaddr_storage orig_dst; socklen_t orig_dst_len = sizeof(orig_dst); tor_addr_t addr; - int rv; #ifdef TRANS_TRPOXY if (options->TransProxyType_parsed == TPT_TPROXY) { @@ -1613,6 +1612,7 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) #endif #ifdef TRANS_NETFILTER + int rv = -1; switch (ENTRY_TO_CONN(conn)->socket_family) { #ifdef TRANS_NETFILTER_IPV4 case AF_INET:

1 0

[tor/master] Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6
by nickm＠torproject.org 04 Mar '15

04 Mar '15

commit 5ad47aafabfdb9718b4beb7c3893af58a9147e2e Merge: 2d926d0 930ab95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:14:17 2015 +0100 Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6 changes/bug15127 | 3 +++ src/common/include.am | 1 + src/or/include.am | 1 + 3 files changed, 5 insertions(+)

1 0