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

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 08 Sep '15

08 Sep '15

commit 6239010dc876ce1a560c12d16a022541907e87e2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 8 19:46:09 2015 +0000 Update translations for torbutton-branddtd --- lt/brand.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/brand.dtd b/lt/brand.dtd index 9a3dd69..fa2db7d 100644 --- a/lt/brand.dtd +++ b/lt/brand.dtd @@ -5,11 +5,11 @@ <!ENTITY brandShorterName "Tor naršyklė"> <!ENTITY brandShortName "Tor naršyklė"> <!ENTITY brandFullName "Tor naršyklė"> -<!ENTITY vendorShortName "Tor Project"> +<!ENTITY vendorShortName "Tor projektas"> <!ENTITY trademarkInfo.part1 "Firefox ir Firefox logotipas yra Mozilla Foundation prekių ženklai.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "Spustelėkite, kad įkeltumėte įdiegtus sistemos papildinius"> +<!ENTITY plugins.installed.enable "Įjungti papildinius"> +<!ENTITY plugins.installed.disable "Išjungti papildinius"> +<!ENTITY plugins.installed.disable.tip "Spustelėkite, kad neleistumėte įkėlinėti sistemos papildinių">

1 0

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

08 Sep '15

commit d6a5a511565cee9669077bc92435d80177845641 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 8 19:45:53 2015 +0000 Update translations for tails-misc --- lt.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lt.po b/lt.po index 499398f..5746b6b 100644 --- a/lt.po +++ b/lt.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-28 21:29+0000\n" +"POT-Creation-Date: 2015-08-28 01:49+0200\n" +"PO-Revision-Date: 2015-09-08 19:41+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid "Tor is ready" -msgstr "" +msgstr "Tor yra paruoštas" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 msgid "You can now access the Internet." -msgstr "" +msgstr "Dabar turite prieigą prie Interneto." #: config/chroot_local-includes/etc/whisperback/config.py:64 #, python-format @@ -62,12 +62,12 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 msgid "_Launch" -msgstr "" +msgstr "Pa_leisti" #: config/chroot_local-includes/usr/local/bin/electrum:21 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 msgid "_Exit" -msgstr "" +msgstr "Iš_eiti" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -231,15 +231,15 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" -msgstr "" +msgstr "Nedelsiant išjungti" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 msgid "Reboot Immediately" -msgstr "" +msgstr "Nedelsiant paleisti iš naujo" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" -msgstr "" +msgstr "neprieinama" #: config/chroot_local-includes/usr/local/bin/tails-about:19 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 @@ -282,13 +282,13 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "" +msgstr "Sinchronizuojamas sistemos laikrodis" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "" +msgstr "Sklandžiam Tor darbui, reikalingas tikslus laikrodis, ypač paslėptoms paslaugoms. Prašome palaukti..." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" @@ -313,7 +313,7 @@ msgstr "Šioje Tails versijoje yra žinomos saugumo problemos:" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "Tinklo plokštė ${nic} išjungta" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 #, sh-format @@ -375,15 +375,15 @@ msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtual #: config/chroot_local-includes/usr/local/bin/tor-browser:29 msgid "Tor is not ready" -msgstr "" +msgstr "Tor neparuoštas" #: config/chroot_local-includes/usr/local/bin/tor-browser:30 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "" +msgstr "Tor neparuoštas. Vis tiek paleisti Tor naršyklę?" #: config/chroot_local-includes/usr/local/bin/tor-browser:31 msgid "Start Tor Browser" -msgstr "" +msgstr "Paleisti Tor naršyklę" #: config/chroot_local-includes/usr/local/bin/tor-browser:32 msgid "Cancel" @@ -420,7 +420,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 msgid "Failed to restart Tor." -msgstr "" +msgstr "Nepavyko iš naujo paleisti Tor." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 @@ -517,7 +517,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" -msgstr "" +msgstr "Sužinoti daugiau apie Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot"

1 0

[tor/master] Make test-network.sh more robust against arguments containing spaces
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit 6b118e1e1e17888beb2d61525c326ddd6bfd7933 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Sep 8 22:27:12 2015 +1000 Make test-network.sh more robust against arguments containing spaces --- src/test/test-network.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index b5d7f7c..451a40a 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -3,9 +3,9 @@ ECHO_N="/bin/echo -n" use_coverage_binary=false -until [ -z $1 ] +until [ -z "$1" ] do - case $1 in + case "$1" in --chutney-path) export CHUTNEY_PATH="$2" shift

1 0

[tor/master] Add "make test-network-all" to verify multiple test networks
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit 5feae32f46b3f0cc3da93ece80163c1a994c83b9 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Sep 8 22:27:59 2015 +1000 Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged. --- Makefile.am | 38 ++++++++++++++++++++++++++++++++++++-- src/test/include.am | 7 +++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index b5e71aa..68695ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,13 +36,16 @@ EXTRA_DIST+= \ if COVERAGE_ENABLED TEST_CFLAGS=-fno-inline -fprofile-arcs -ftest-coverage TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE -TEST_NETWORK_FLAGS="--coverage" +TEST_NETWORK_FLAGS=--coverage --hs-multi-client 1 else TEST_CFLAGS= TEST_CPPFLAGS=-DTOR_UNIT_TESTS -TEST_NETWORK_FLAGS= +TEST_NETWORK_FLAGS=--hs-multi-client 1 endif +TEST_NETWORK_ALL_LOG_DIR=$(top_builddir)/test_network_log +TEST_NETWORK_ALL_DRIVER_FLAGS=--color-tests yes + #install-data-local: # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor @@ -88,6 +91,36 @@ need-chutney-path: test-network: need-chutney-path all $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_FLAGS) +# Run all available tests using automake's test-driver +# only run IPv6 tests if we can ping6 ::1 (localhost) +# some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011) +# only run mixed tests if we have a tor-stable binary +# see #17015 for autodetection of different tor versions +test-network-all: need-chutney-path all test-driver + mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) + @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ + if ping6 -q -o ::1 >/dev/null 2>&1; then \ + echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ + flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ + else \ + echo "ping6 ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ + skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ + fi; \ + if command -v tor-stable >/dev/null 2>&1; then \ + echo "tor-stable found, running mixed flavors: $(TEST_CHUTNEY_FLAVORS_MIXED)."; \ + flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_MIXED)"; \ + else \ + echo "tor-stable not found, skipping mixed flavors: $(TEST_CHUTNEY_FLAVORS_MIXED)."; \ + skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_MIXED)"; \ + fi; \ + for f in $$skip_flavors; do \ + echo "SKIP: $$f"; \ + done; \ + for f in $$flavors; do \ + ./test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \ + done + @echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)." + need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \ echo '$$STEM_SOURCE_DIR was not set.'; echo; \ @@ -173,3 +206,4 @@ mostlyclean-local: rm -f $(top_builddir)/src/*/*.gc{da,no} $(top_builddir)/src/*/*/*.gc{da,no} rm -rf $(HTML_COVER_DIR) rm -rf $(top_builddir)/doc/doxygen + rm -rf $(TEST_NETWORK_ALL_LOG_DIR) diff --git a/src/test/include.am b/src/test/include.am index ef2fd4f..f7c0204 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -8,6 +8,13 @@ endif TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ src/test/test_workqueue src/test/test_keygen.sh $(TESTSCRIPTS) +# These flavors are run using automake's test-driver and test-network.sh +TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min bridges+hs +# only run if we can ping6 ::1 (localhost) +TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min +# only run if we can find a stable (or simply another) version of tor +TEST_CHUTNEY_FLAVORS_MIXED = mixed + ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet. Below is a kludge to work around. ###

1 0

[tor/master] make test-network-all exit 1 if any test network fails
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit 60c6debda86e2ff6255f588d6b8e4e204a821bda Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Sep 9 03:06:01 2015 +1000 make test-network-all exit 1 if any test network fails --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 68695ed..c226113 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,8 +118,9 @@ test-network-all: need-chutney-path all test-driver done; \ for f in $$flavors; do \ ./test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \ - done - @echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)." + done; \ + echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ + ! grep -q FAIL test_network_log/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \

1 0

[tor/master] Increase default boostrap time in test-network.sh
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit 036966e3ec02d48ff3f69403430cb6d019ac5bcf Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Sep 9 04:21:07 2015 +1000 Increase default boostrap time in test-network.sh Increase default boostrap time in test-network.sh to 30 seconds, for larger networks like bridges+ipv6+hs. This avoids the failure-hiding issues inherent in the retry approach in #16952. --- src/test/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 451a40a..576fbed 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -86,7 +86,7 @@ export CHUTNEY_TOR_GENCERT="${TOR_DIR}/src/tools/${tor_gencert_name}" # Sleep some, waiting for the network to bootstrap. # TODO: Add chutney command 'bootstrap-status' and use that instead. -BOOTSTRAP_TIME=${BOOTSTRAP_TIME:-25} +BOOTSTRAP_TIME=${BOOTSTRAP_TIME:-30} $ECHO_N "$myname: sleeping for $BOOTSTRAP_TIME seconds" n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do sleep 1; n=$(expr $n - 1); $ECHO_N .

1 0

[tor/master] Merge remote-tracking branch 'teor/make-test-network-all'
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit c59257d3787a452b34bc8c608c2c123929bdad0d Merge: 7ffc048 036966e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 8 14:43:34 2015 -0400 Merge remote-tracking branch 'teor/make-test-network-all' Makefile.am | 39 +++++++++++++++++++++++++++++++++++++-- src/test/include.am | 7 +++++++ src/test/test-network.sh | 6 +++--- 3 files changed, 47 insertions(+), 5 deletions(-)

1 0

[tor/master] changes file for 16953
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit 98be93d6d7f8a72861de7444a8356e8d1abf6bb0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 8 14:44:34 2015 -0400 changes file for 16953 --- changes/test-net-all | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/test-net-all b/changes/test-net-all new file mode 100644 index 0000000..9a2e5ed --- /dev/null +++ b/changes/test-net-all @@ -0,0 +1,3 @@ + o Testing: + - New make target (make test-network-all) to run multiple applicable + chutney test cases. Patch from Teor; closes 16953.

1 0

[tor/master] Bug 15482: Don't abandon circuits that are still in use for browsing.
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit a16115d9cb8c2e88da8a59c212155e2fd0e16aa3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 27 12:57:37 2015 -0700 Bug 15482: Don't abandon circuits that are still in use for browsing. Only applies to connections with SOCKS auth set, so that non-web Tor activity is not affected. Simpler version of Nick's patch because the randomness worried me, and I'm not otherwise sure why we want a max here. --- src/or/circuituse.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index a3b7197..e10bb82 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2284,8 +2284,15 @@ connection_ap_handshake_attach_chosen_circuit(entry_connection_t *conn, base_conn->state = AP_CONN_STATE_CIRCUIT_WAIT; - if (!circ->base_.timestamp_dirty) - circ->base_.timestamp_dirty = time(NULL); + if (!circ->base_.timestamp_dirty) { + circ->base_.timestamp_dirty = approx_time(); + } else if ((conn->entry_cfg.isolation_flags & ISO_SOCKSAUTH) && + (conn->socks_request->usernamelen || + conn->socks_request->passwordlen)) { + /* When stream isolation is in use and controlled by an application + * we are willing to keep using the stream. */ + circ->base_.timestamp_dirty = approx_time(); + } pathbias_count_use_attempt(circ);

1 0

[tor/master] Merge branch 'feature15482_squashed'
by nickm＠torproject.org 08 Sep '15

08 Sep '15

commit fcec1f338110d17dd23668558a87f0f5ea8a8ee1 Merge: 4c6fd71 54510d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 8 14:03:04 2015 -0400 Merge branch 'feature15482_squashed' changes/feature15482 | 5 +++++ doc/tor.1.txt | 7 ++++++- src/or/circuituse.c | 11 +++++++++-- src/or/config.c | 11 +++++++++++ src/or/or.h | 7 +++++++ 5 files changed, 38 insertions(+), 3 deletions(-)

1 0