April 2013 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 01 Apr '13

01 Apr '13

commit ec36539aef21825b1e759415c24710978b951338 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 11:15:56 2013 +0000 Update translations for whisperback --- pl/pl.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 3f7e28b..ca571f9 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <bog.d(a)gazeta.pl>, 2013. # EJI <ewa.infeld(a)gmail.com>, 2013. # Eva Infeld <ewa.infeld(a)gmail.com>, 2013. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-03-27 08:21+0000\n" -"Last-Translator: Quaithe <ewa.infeld(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-01 10:49+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +40,7 @@ msgstr "Błedny klucz publiczny OpenPGP." msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "" +msgstr "Nie znaleziono zmiennej %s w żadnym pliku konfiguracyjnym /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" #: ../whisperBack/gui.py:151 msgid "Unable to load a valid configuration." @@ -129,7 +130,7 @@ msgstr "tłumaczenie" #: ../whisperBack/gui.py:419 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "" +msgstr "To nie wygląda na prawidłowy adres URL lub klucz OpenPGP." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org"

1 0

[torbrowser/master] add geoip6 files to alpha bundles
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit b6b517e34ef295983b10fefe77e834be1e2e1c8c Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 19 15:50:39 2013 -0400 add geoip6 files to alpha bundles --- build-scripts/config/alpha/torrc | 1 + build-scripts/config/alpha/torrc-linux | 2 +- build-scripts/config/alpha/torrc-osx | 1 + build-scripts/linux-alpha.mk | 1 + build-scripts/osx-alpha.mk | 1 + build-scripts/windows-alpha.mk | 1 + 6 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/alpha/torrc b/build-scripts/config/alpha/torrc index 16f9486..1c79def 100644 --- a/build-scripts/config/alpha/torrc +++ b/build-scripts/config/alpha/torrc @@ -3,6 +3,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory .\Data\Tor GeoIPFile .\Data\Tor\geoip +GeoIPv6File .\Data\Tor\geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux index 7d11921..aea57fd 100644 --- a/build-scripts/config/alpha/torrc-linux +++ b/build-scripts/config/alpha/torrc-linux @@ -2,7 +2,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory ./Data/Tor -GeoIPFile ./Data/Tor/geoip +GeoIPv6File ./Data/Tor/geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout diff --git a/build-scripts/config/alpha/torrc-osx b/build-scripts/config/alpha/torrc-osx index f9c71d5..877c70b 100644 --- a/build-scripts/config/alpha/torrc-osx +++ b/build-scripts/config/alpha/torrc-osx @@ -3,6 +3,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory ../../Contents/Resources/Data/Tor GeoIPFile ../../Contents/Resources/Data/Tor/geoip +GeoIPv6File ../../Contents/Resources/Data/Tor/geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index b8e1c7a..7121474 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -362,6 +362,7 @@ else cp config/alpha/torrc-linux $(DEST)/Data/Tor/torrc endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip + cp $(TOR_DIR)/src/config/geoip6 $(DEST)/Data/Tor/geoip6 chmod 700 $(DEST)/Data/Tor # We've replaced the custom C program with a shell script for now... diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7edbc40..7ad744d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -369,6 +369,7 @@ else cp config/alpha/torrc-osx $(DEST)/Library/Vidalia/torrc endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip + cp $(TOR_DIR)/src/config/geoip6 $(DEST)/Contents/Resources/Data/Tor/geoip6 chmod 700 $(DATADIR)/Tor # We've replaced the custom C program with a shell script for now... diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 02424ec..56233c4 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -374,6 +374,7 @@ else cp config/alpha/torrc $(DEST)/Data/Tor/torrc endif cp $(TOR)/src/config/geoip $(DEST)/Data/Tor + cp $(TOR)/src/config/geoip6 $(DEST)/Data/Tor launcher: cd ../src/RelativeLink/ && $(MAKE)

1 0

[torbrowser/master] bump Firefox to 17.0.5esr
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit e1d0d534f2a672cc1bfa9611c84bfff77d033586 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Mar 30 20:08:06 2013 -0400 bump Firefox to 17.0.5esr --- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 7121474..3a15d53 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d72fd28..2bcbb9a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7ad744d..1429c5b 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index dda7f4f..4215627 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 59a2989..c4ed4e0 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.11-alpha PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.4esr +FIREFOX_VER=17.0.5esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.1 -NOSCRIPT_VER=2.6.5.8 +NOSCRIPT_VER=2.6.5.9 HTTPSEVERYWHERE_VER=4.0development.6 PDFJS_VER=0.7.236 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 884dd32..d226473 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.4esr +FIREFOX_VER=17.0.5esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.1 -NOSCRIPT_VER=2.6.5.8 +NOSCRIPT_VER=2.6.5.9 HTTPSEVERYWHERE_VER=3.1.4 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 56233c4..76bd01e 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a9db5c0..9fb6a2b 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit 60b1fd96a060982210b88bb0d4b8d0759164da79 Merge: aec197e a3903bc Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Mar 31 23:04:57 2013 -0700 Merge branch 'maint-2.4' .../0008-Disable-SSL-Session-ID-tracking.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

[torbrowser/master] Fix SSL Session ID patch for FF17.0.5-esr.
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit a3903bca01db47226c909e0880c4f3c089fcd0e0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Mar 31 23:04:24 2013 -0700 Fix SSL Session ID patch for FF17.0.5-esr. --- .../0008-Disable-SSL-Session-ID-tracking.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch index 1a20c3a..494c765 100644 --- a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch @@ -1,6 +1,6 @@ -From 0cdbc52ac00f33e532b5485cf12286a1dc11b981 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Wed, 7 Dec 2011 19:36:38 -0800 +From e700063f5d18e86077af8ecf7fb3f4d92f2d0ef4 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Sun, 31 Mar 2013 22:48:00 -0700 Subject: [PATCH 08/27] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, @@ -8,21 +8,21 @@ so we have to disable them to satisfy https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…. --- security/nss/lib/ssl/sslsock.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c -index 0c4d0c7..8d23fc0 100644 +index 4f4b034..6ce5d11 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c -@@ -173,7 +173,7 @@ static sslOptions ssl_defaults = { +@@ -141,7 +141,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* enableSSL2 */ /* now defaults to off in NSS 3.13 */ - PR_TRUE, /* enableSSL3 */ - PR_TRUE, /* enableTLS */ /* now defaults to on in NSS 3.0 */ + PR_FALSE, /* unusedBit9 */ + PR_FALSE, /* unusedBit10 */ - PR_FALSE, /* noCache */ + PR_TRUE, /* noCache */ PR_FALSE, /* fdx */ PR_FALSE, /* v2CompatibleHello */ /* now defaults to off in NSS 3.13 */ PR_TRUE, /* detectRollBack */ -- -1.7.5.4 +1.7.9.5

1 0

[torbrowser/maint-2.4] Fix SSL Session ID patch for FF17.0.5-esr.
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit a3903bca01db47226c909e0880c4f3c089fcd0e0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Mar 31 23:04:24 2013 -0700 Fix SSL Session ID patch for FF17.0.5-esr. --- .../0008-Disable-SSL-Session-ID-tracking.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch index 1a20c3a..494c765 100644 --- a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch @@ -1,6 +1,6 @@ -From 0cdbc52ac00f33e532b5485cf12286a1dc11b981 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Wed, 7 Dec 2011 19:36:38 -0800 +From e700063f5d18e86077af8ecf7fb3f4d92f2d0ef4 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Sun, 31 Mar 2013 22:48:00 -0700 Subject: [PATCH 08/27] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, @@ -8,21 +8,21 @@ so we have to disable them to satisfy https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…. --- security/nss/lib/ssl/sslsock.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c -index 0c4d0c7..8d23fc0 100644 +index 4f4b034..6ce5d11 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c -@@ -173,7 +173,7 @@ static sslOptions ssl_defaults = { +@@ -141,7 +141,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* enableSSL2 */ /* now defaults to off in NSS 3.13 */ - PR_TRUE, /* enableSSL3 */ - PR_TRUE, /* enableTLS */ /* now defaults to on in NSS 3.0 */ + PR_FALSE, /* unusedBit9 */ + PR_FALSE, /* unusedBit10 */ - PR_FALSE, /* noCache */ + PR_TRUE, /* noCache */ PR_FALSE, /* fdx */ PR_FALSE, /* v2CompatibleHello */ /* now defaults to off in NSS 3.13 */ PR_TRUE, /* detectRollBack */ -- -1.7.5.4 +1.7.9.5

1 0