tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[tor-browser-bundle/master] Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 53a8b3a994be27762c98bc3fa58f38a46532babc Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Apr 6 17:53:46 2014 -0700 Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux --- .../linux/gitian-pluggable-transports.yml | 3 ++- .../windows/gitian-pluggable-transports.yml | 23 ++++++++++---------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 6619a1c..fbea855 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -133,8 +133,9 @@ script: | cd .. # cd fteproxy + ln -s $INSTDIR/gmp thirdparty/gmp find -type f | xargs touch --date="$REFERENCE_DATETIME" - CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" make + make cp -a bin/fteproxy $PTDIR/ cp -ra fte $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 9b0e8ec..d2a3005 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -97,7 +97,6 @@ script: | make make install cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor - cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor cd .. # # @@ -119,6 +118,7 @@ script: | # http://wiki.winehq.org/msiexec # /qn disables user interface; /i installs. LD_PRELOAD= msiexec /qn /i python.msi TARGETDIR=$INSTDIR/python + sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $INSTDIR/python/Lib/distutils/cygwinccompiler.py INSTPYTHON="wine $INSTDIR/python/python.exe" # 7z x py2exe.exe @@ -226,21 +226,20 @@ script: | cd .. # cd fteproxy - cp $INSTDIR/gmp/bin/*dll* . - cp $INSTDIR/gmp/lib/*dll* . ln -s $INSTDIR/gmp thirdparty/gmp + cp -a $INSTDIR/gmp/bin/libgmp-*.dll . find -type f | xargs touch --date="$REFERENCE_DATETIME" - make win32 - make thirdparty/re2/obj/libre2.a - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace - LD_PRELOAD= $INSTPYTHON setup.py py2exe + WINDOWS_BUILD=1 CROSS_COMPILE=1 make thirdparty/re2/obj/libre2.a + LD_PRELOAD= $INSTPYTHON setup_tbb.py build_ext -c mingw32 + LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip - mkdir -p $PTDIR/fte - mkdir -p $PTDIR/fte/tests cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ - cp -an fte/VERSION $PTDIR/fte - cp -ran fte/defs $PTDIR/fte - cp -ran fte/tests/dfas $PTDIR/fte/tests + mkdir -p $PTDIR/fte + cp -a fte/VERSION $PTDIR/fte + mkdir -p $PTDIR/fte/defs + cp -a fte/defs/*.json $PTDIR/fte/defs + mkdir -p $PTDIR/fte/tests/dfas + cp -a fte/tests/dfas/{*.dfa,*.regex} $PTDIR/fte/tests/dfas mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. diff --git a/gitian/versions b/gitian/versions index b49c276..673cf32 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 498bcb6..5447d76 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.beta b/gitian/versions.beta index 2d9c3af..8c8433d 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Update default PT Bridges.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit ae9d19adf7935782d926919c84977f703b7ebadf Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Tue Apr 8 12:24:27 2014 -0700 Update default PT Bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 47d20e8..2d9777c 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -2,13 +2,13 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); // Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239"); pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); @@ -18,3 +18,6 @@ pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5 pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");

1 0

[tor-browser-bundle/master] Move obfsproxy back to 0.2.4.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 13dd293a1888d6faac8fcb39d10c4938c639b443 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 11:32:49 2014 -0700 Move obfsproxy back to 0.2.4. Moving back to last known-good. 0.2.6 won't launch either. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5447d76..2bdbb2d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 diff --git a/gitian/versions.beta b/gitian/versions.beta index 8c8433d..9ec3927 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Fix changelog for obfsproxy3.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 751c60a211bfea3156f34d63f47a10eabb18f2d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 15:19:21 2014 -0700 Fix changelog for obfsproxy3. --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 42c764c..af9b59d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,6 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. - * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.0

1 0

[tor-browser-bundle/master] Bump Tor Launcher version.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 6d2934c93e402e544e8df8e248134bd3305d26ce Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 08:46:44 2014 -0700 Bump Tor Launcher version. Turkish DTDs were missing. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index af9b59d..9b66b5e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,7 +7,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * Update Torbutton to 1.6.8.0 * Bug 11242: Fix improper "update needed" message after in-place upgrade. * Bug 10398: Ease translation of about:tor page elements - * Update Tor Launcher to 0.2.5.2 + * Update Tor Launcher to 0.2.5.3 * Bug 9665: Localize Tor's unreachable bridges bootstrap error * Backport Pending Tor Patches: * Bug 9665: Report a bootstrap error if all bridges are unreachable diff --git a/gitian/versions.beta b/gitian/versions.beta index 9ec3927..ca59070 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.4.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.2 +TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0

[tor-browser-bundle/master] Remove busted FTE bridges (bad fingerprints).
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit e58aabac8234b4115cef70030e213caf6444607f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 09:01:34 2014 -0700 Remove busted FTE bridges (bad fingerprints). --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2d9777c..bb000cd 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,8 +16,10 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +// XXX: Fingerprints changed: +//pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); +//pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +

1 0

[tor-browser-bundle/master] Backport fix for Bug9665.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit ab04781bdb01977b9b122681474bfecb96017169 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 20:05:47 2014 -0700 Backport fix for Bug9665. --- gitian/descriptors/linux/gitian-tor.yml | 4 +- gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug9665.patch | 108 +++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 698fcba..15ba469 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -28,8 +28,9 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" -- "bug11069.patch" - "bug11200.patch" +- "bug11069.patch" +- "bug9665.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -98,6 +99,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 30c23bb..5ea3b4e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -31,6 +31,7 @@ files: - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" +- "bug9665.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -109,6 +110,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 1698726..6369e7f 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" +- "bug9665.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -105,6 +106,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug9665.patch b/gitian/patches/bug9665.patch new file mode 100644 index 0000000..aeab37b --- /dev/null +++ b/gitian/patches/bug9665.patch @@ -0,0 +1,108 @@ +From 08ae53e400ff6fa2d8147aad440c38173c106cae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A1bio=20J=2E=20Bertinatto?= <fabiojrb(a)gmail.com> +Date: Tue, 5 Nov 2013 00:50:16 -0200 +Subject: [PATCH 1/3] Fix bug9665 + +--- + src/or/connection_or.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 04ad2cc..ba3ac00 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1195,6 +1195,11 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + "your pluggable transport proxy stopped running.", + fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port), + transport_name, transport_name); ++ ++ control_event_bootstrap_problem( ++ "Can't connect to bridge", ++ END_OR_CONN_REASON_NO_ROUTE); ++ + } else { + log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but " + "the proxy address could not be found.", +-- +1.8.1.2 + +From 754a50592c412d95d2eb48038784d0ef725a7dc2 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 7 Apr 2014 13:41:07 -0400 +Subject: [PATCH 2/3] Forward-port bug9665 fix to work with our fix for 11069 + +--- + src/or/connection_or.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index ba3ac00..01ff4dc 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1198,7 +1198,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + + control_event_bootstrap_problem( + "Can't connect to bridge", +- END_OR_CONN_REASON_NO_ROUTE); ++ END_OR_CONN_REASON_NO_ROUTE, ++ conn); + + } else { + log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but " +-- +1.8.1.2 + +From 90341b4852bf88f1fdf9fd150fa2f5c47f88b2cb Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 7 Apr 2014 13:44:22 -0400 +Subject: [PATCH 3/3] For missing transport, say "PT_MISSING" not "NO_ROUTE" + +--- + src/or/connection_or.c | 2 +- + src/or/or.h | 3 ++- + src/or/reasons.c | 2 ++ + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 01ff4dc..6572a91 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1198,7 +1198,7 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + + control_event_bootstrap_problem( + "Can't connect to bridge", +- END_OR_CONN_REASON_NO_ROUTE, ++ END_OR_CONN_REASON_PT_MISSING, + conn); + + } else { +diff --git a/src/or/or.h b/src/or/or.h +index 38ab176..1b35c1f 100644 +--- a/src/or/or.h ++++ b/src/or/or.h +@@ -604,7 +604,8 @@ typedef enum { + #define END_OR_CONN_REASON_NO_ROUTE 6 /* no route to host/net */ + #define END_OR_CONN_REASON_IO_ERROR 7 /* read/write error */ + #define END_OR_CONN_REASON_RESOURCE_LIMIT 8 /* sockets, buffers, etc */ +-#define END_OR_CONN_REASON_MISC 9 ++#define END_OR_CONN_REASON_PT_MISSING 9 /* PT failed or not available */ ++#define END_OR_CONN_REASON_MISC 10 + + /* Reasons why we (or a remote OR) might close a stream. See tor-spec.txt for + * documentation of these. The values must match. */ +diff --git a/src/or/reasons.c b/src/or/reasons.c +index 0674474..750e89b 100644 +--- a/src/or/reasons.c ++++ b/src/or/reasons.c +@@ -231,6 +231,8 @@ orconn_end_reason_to_control_string(int r) + return "RESOURCELIMIT"; + case END_OR_CONN_REASON_MISC: + return "MISC"; ++ case END_OR_CONN_REASON_PT_MISSING: ++ return "PT_MISSING"; + case 0: + return ""; + default: +-- +1.8.1.2 +

1 0

[tor-launcher/master] Add turkish dtd files, bump version.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 773de03a2ce611a5ddf4a5162f9c5d1cf9ef1b2c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 08:43:30 2014 -0700 Add turkish dtd files, bump version. Also update translations. --- src/chrome/locale/ar/torlauncher.properties | 1 + src/chrome/locale/de/torlauncher.properties | 1 + src/chrome/locale/es/torlauncher.properties | 1 + src/chrome/locale/eu/torlauncher.properties | 1 + src/chrome/locale/fa/torlauncher.properties | 1 + src/chrome/locale/fr/torlauncher.properties | 1 + src/chrome/locale/it/torlauncher.properties | 1 + src/chrome/locale/ja/torlauncher.properties | 1 + src/chrome/locale/ko/torlauncher.properties | 1 + src/chrome/locale/nl/torlauncher.properties | 1 + src/chrome/locale/pl/torlauncher.properties | 1 + src/chrome/locale/pt/torlauncher.properties | 1 + src/chrome/locale/ru/torlauncher.properties | 1 + src/chrome/locale/sv/torlauncher.properties | 1 + src/chrome/locale/tr/network-settings.dtd | 64 ++++++++++++++++++++++++ src/chrome/locale/tr/progress.dtd | 4 ++ src/chrome/locale/tr/torlauncher.properties | 1 + src/chrome/locale/vi/torlauncher.properties | 1 + src/chrome/locale/zh-CN/torlauncher.properties | 1 + src/install.rdf | 2 +- 20 files changed, 86 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index c7ee50d..ff393f7 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=لم تتطابق الهوية torlauncher.bootstrapWarning.timeout=الاتصال عاطل torlauncher.bootstrapWarning.noroute=لا طريق للمضيف torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index bcbb64e..8ba8ae1 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=Nichtübereinstimmung der Identitäten torlauncher.bootstrapWarning.timeout=Verbindungszeitüberschreitung torlauncher.bootstrapWarning.noroute=Kein Pfad zum Rechner torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler +torlauncher.bootstrapWarning.pt_missing=Pluggable Transport fehlt diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 9739b50..4c1fc30 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=las identidades no coinciden torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión agotado torlauncher.bootstrapWarning.noroute=no hay ruta hacia el servidor ('host') torlauncher.bootstrapWarning.ioerror=error de lectura/escritura +torlauncher.bootstrapWarning.pt_missing=transporte enchufable desaparecido diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 2d57a88..3f4fb59 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=nortasuna ez dator bat torlauncher.bootstrapWarning.timeout=konexioa denboraz kanpo torlauncher.bootstrapWarning.noroute=ez dago biderik ostalarira torlauncher.bootstrapWarning.ioerror=irakurketa/idazketa akatsa +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index 0571889..4914fb2 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=عدم تطبیق هویت torlauncher.bootstrapWarning.timeout=اتمام وقت اتصال torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 807e901..d113f54 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identité incorrecte torlauncher.bootstrapWarning.timeout=temps de connexion expiré torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture +torlauncher.bootstrapWarning.pt_missing=un transport câblé est manquant diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index 0d71880..9fc125d 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=discordanza di identità torlauncher.bootstrapWarning.timeout=timeout della connessione torlauncher.bootstrapWarning.noroute=nessun rotta per l'host torlauncher.bootstrapWarning.ioerror=errore di lettura/scrittura +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index 3ab1b23..ad50a92 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=識別子の不一致 torlauncher.bootstrapWarning.timeout=接続タイムアウト torlauncher.bootstrapWarning.noroute=ホストへの経路が見つかりません torlauncher.bootstrapWarning.ioerror=読み書きエラー +torlauncher.bootstrapWarning.pt_missing=プラグ可能な転送が見つかりません diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 3629f23..8714f80 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=계정 불일치 torlauncher.bootstrapWarning.timeout=연결 타임아웃 torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류 +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 39fd76a..c4b2760 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identiteitsfout torlauncher.bootstrapWarning.timeout=verbindingstimeout torlauncher.bootstrapWarning.noroute=geen route naar de server torlauncher.bootstrapWarning.ioerror=lees/schrijffout +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index d982fb7..7651ef2 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=niezgodność tożsamości torlauncher.bootstrapWarning.timeout=upłynął czas połączenia torlauncher.bootstrapWarning.noroute=brak trasy do hosta torlauncher.bootstrapWarning.ioerror=błąd zapisu/odczytu +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 08961b1..87b8aeb 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identidade não correspondente torlauncher.bootstrapWarning.timeout=Tempo de ligação expirado torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro torlauncher.bootstrapWarning.ioerror=Erro de leitura/escrita +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index f9f81a7..ad50365 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=несоответствие иденти torlauncher.bootstrapWarning.timeout=Тайм-аут соединения torlauncher.bootstrapWarning.noroute=не указан путь к хосту torlauncher.bootstrapWarning.ioerror=ошибка чтения / записи +torlauncher.bootstrapWarning.pt_missing=отсутствует подключаемый транспорт diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 7efa755..375bd8c 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identitet felmatchad torlauncher.bootstrapWarning.timeout=tidsgränsen överskreds torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas torlauncher.bootstrapWarning.ioerror=läs-/skrivfel +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd new file mode 100644 index 0000000..4f465de --- /dev/null +++ b/src/chrome/locale/tr/network-settings.dtd @@ -0,0 +1,64 @@ +<!ENTITY torsettings.dialog.title "Tor Ağ Ayarları"> + + + +<!ENTITY torsettings.prompt "Tor ağa bağlanmadan önce, bu bilgisayarın İnternet bağlantısı hakkında bilgi vermeniz gerekir."> + +<!ENTITY torSettings.yes "Evet"> +<!ENTITY torSettings.no "Hayır"> + +<!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> +<!ENTITY torSettings.configurePrompt1 "İnternet bağlantınız sansürlenmiş,filtrelenmiş veyahut proxylenmiş."> +<!ENTITY torSettings.configurePrompt2 "Köprü, güvenlik duvarı ve vekil sunucu ayarlarının konfigürasyonunu yapmam lazım."> +<!ENTITY torSettings.configure "Yapılandır"> +<!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum"> +<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumlarda çalışır."> +<!ENTITY torSettings.connect "Bağlan"> + +<!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternete erişirken bir vekil kullanması gerekiyor mu?"> + +<!ENTITY torSettings.proxyHelp "Eğer bu soruyu nasıl yanıtlayacağınızdan emin değilseniz, farklı bir tarayıcıda İnternet seçeneklerine bakın ve bir vekil kullanmak üzere yapılandırılıp yapılandırılmadığına bakın"> +<!ENTITY torSettings.enterProxy "Vekil ayarlarını girin."> +<!ENTITY torSettings.firewallQuestion "Bu bilgisayarın İnternet bağlantısı, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarından geçiyor mu?"> +<!ENTITY torSettings.firewallHelp "Eğer bu soruya nasıl cevap vereceğinizden emin değilseniz, Hayır seçin. Eğer Tor ağına bağlanırken sorunla karşılaşırsanız, bu ayarı değiştirin."> +<!ENTITY torSettings.enterFirewall "Güvenlik duvarı tarafından izin verilen bağlantı noktalarının virgülle ayrılmış bir listesini girin."> +<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınızı (ISS) engellesin veya ayrıcaTor Bağlantınızı sansürlesin mi?"> +<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır 'ı Secin.&#160; Eğer Evet'i seçerseniz, Tor Ağ bağlantıları engellemek için, daha zor hale getirilip listelenmeyen aktarmalar için Tor Köprülerini yapılandırmanız istenecektir."> +<!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprülerin kümesini kullanabilirsiniz veya özel bir köprü seti girebilir veya sağlayabilirsiniz."> + + + +<!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor..."> +<!ENTITY torsettings.restart "Yeniden Başlat"> + +<!ENTITY torsettings.optional "İsteğe Bağlı"> + +<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarın İnternet'e erişebilmek için bir vekil sunucu kullanması gerekiyor"> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> +<!ENTITY torsettings.useProxy.address "Adres:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresi veya sunucu adı"> +<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.username "Kullanıcı adı:"> +<!ENTITY torsettings.useProxy.password "Parola:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "Bu bilgisayar, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarı ile bağlanıyor"> +<!ENTITY torsettings.firewall.allowedPorts "İzin verilen portlar:"> +<!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (İSS) Tor Ağı ile bağlantılarımı engelliyor"> +<!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> +<!ENTITY torsettings.useBridges.type "Taşıma türü:"> +<!ENTITY torsettings.useBridges.custom "Özel köprüler girin"> +<!ENTITY torsettings.useBridges.label "Bir veya daha fazla köprü aynası girin (her satıra bir tane)."> +<!ENTITY torsettings.useBridges.placeholder "adresi yazın:port"> + +<!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> +<!ENTITY torsettings.bridgeHelpTitle "Köprü Ayna Yardımı"> +<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, nedeni kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.&#160; Çoğunlukla bu problemi Tor köprüleri ile çözebilirisiniz bunlar engellenmesi daha zor olan listede olmayan aktarma noktalarıdır"> +<!ENTITY torsettings.bridgeHelp1B "Önceden yapılandırılan sağlanan köprü adresleri setini kullanabilirsiniz veya bu üç yöntemden birini kullanarak adres kümesinden özel bir set sağlayabilirsiniz:"> +<!ENTITY torsettings.bridgeHelp2Heading "Web aracılığıyla."> +<!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org sitesini ziyaret etmek için web tarayıcısı kullanın."> +<!ENTITY torsettings.bridgeHelp3Heading "Eposta otomatik cevaplandırıcı aracılığıyla."> +<!ENTITY torsettings.bridgeHelp3 "bridges(a)torproject.org adresine, iletide sadece 'get bridges' satırını yazarak bir e-posta gönderin.&#160; Ancak, bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu epostayı gmail.com veya yahoo.com adreslerinden yollamanız gerekmektedir."> +<!ENTITY torsettings.bridgeHelp4Heading "Help Desk aracılığıyla."> +<!ENTITY torsettings.bridgeHelp4 "Son bir çare olarak köprü adres taleplerini help(a)rt.torproject.org adresine posta göndererek rica edebilirsiniz.&#160 Birisinin bu talebi cevaplayacağını unutmayın."> diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd new file mode 100644 index 0000000..c61e5ac --- /dev/null +++ b/src/chrome/locale/tr/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Tor Durumu"> +<!ENTITY torprogress.openSettings "Ayarları Aç"> +<!ENTITY torprogress.heading "Tor ağına bağlanıyor"> +<!ENTITY torprogress.pleaseWait "Biz Tor şebekesi ile bağlantı kurana lütfen bekleyin."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 874951b..1a0226b 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=kimlik uyumsuz torlauncher.bootstrapWarning.timeout=Zaman aşımı torlauncher.bootstrapWarning.noroute=Yönlendirilecek sunucu yok torlauncher.bootstrapWarning.ioerror=Okuma/yazma hatası +torlauncher.bootstrapWarning.pt_missing=takılabilir taşıma kayıp diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 9cfc93d..e57776c 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=nhận dạng không phù hợp torlauncher.bootstrapWarning.timeout=kết nối timeout torlauncher.bootstrapWarning.noroute=không có lộ trình để lưu trữ torlauncher.bootstrapWarning.ioerror=lỗi đọc / ghi +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index adc973e..6c9d920 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=身份不一致 torlauncher.bootstrapWarning.timeout=连接超时 torlauncher.bootstrapWarning.noroute=没有可用链路 torlauncher.bootstrapWarning.ioerror=读写错误 +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/install.rdf b/src/install.rdf index f523acf..0e8614e 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.5.2</em:version> + <em:version>0.2.5.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[meek/master] Use an event loop technique to block without a dialog.
by dcf＠torproject.org 10 Apr '14

10 Apr '14

commit 2f753a57ea2fb8db0a1a0cc7d401a4db59f4ab98 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 10 00:51:35 2014 -0700 Use an event loop technique to block without a dialog. --- firefox/components/main.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 43979e3..cff6ef0 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -68,9 +68,10 @@ MeekHTTPHelper.prototype = { dump("meek-http-helper: listen 127.0.0.1:" + serverSocket.port + "\n"); // Block forever. - var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Components.interfaces.nsIPromptService); - prompts.confirm(null, "Query", "Get down, get funky?"); + // https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Threads#Waiting_f… + var thread = Components.classes["@mozilla.org/thread-manager;1"].getService().currentThread; + while (true) + thread.processNextEvent(true); } finally { var app = Components.classes["@mozilla.org/toolkit/app-startup;1"] .getService(Components.interfaces.nsIAppStartup);

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 10 Apr '14

10 Apr '14

commit 2e020fb5418fb8eea32083205719d7c24c84de43 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 10 10:15:51 2014 +0000 Update translations for tails-misc --- en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en_GB.po b/en_GB.po index 58326b7..2b5de50 100644 --- a/en_GB.po +++ b/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-04-04 08:50+0000\n" +"PO-Revision-Date: 2014-04-10 10:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -95,7 +95,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:357 msgid "Name" -msgstr "" +msgstr "Name" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014