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

[torbrowser/master] Fix JSON.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit ba9d6b21ad3e0f8ca2f44b96b40ca04de72dcc30 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 8 16:05:04 2014 -0700 Fix JSON. --- build-scripts/recommended-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 8e1399c..fcc2607 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -7,7 +7,7 @@ "3.5.4-Windows", "3.6-beta-1-Linux", "3.6-beta-1-MacOS", -"3.6-beta-1-Windows" +"3.6-beta-1-Windows", "3.6-beta-2-Linux", "3.6-beta-2-MacOS", "3.6-beta-2-Windows"

1 0

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

08 Apr '14

commit 3c28f65fde9d32154ea790d644d5e090fddbf6b8 Merge: b3e9b16 ba9d6b2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 8 16:05:15 2014 -0700 Merge branch 'maint-2.4' build-scripts/recommended-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

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

08 Apr '14

commit b3e9b161754d788154f033dd3faf71eb38f34f3f Merge: f85d4d1 fc393b4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 8 14:49:14 2014 -0700 Merge branch 'maint-2.4' build-scripts/recommended-versions | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[torbrowser/master] Add 3.5.4 and 3.6-beta-2 as valid versions.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit fc393b4a3ea8766c064fed9e42ab18c3201f95ea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 8 14:48:58 2014 -0700 Add 3.5.4 and 3.6-beta-2 as valid versions. --- build-scripts/recommended-versions | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 6e4e306..8e1399c 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -2,7 +2,13 @@ "3.5.3-Linux", "3.5.3-MacOS", "3.5.3-Windows", +"3.5.4-Linux", +"3.5.4-MacOS", +"3.5.4-Windows", "3.6-beta-1-Linux", "3.6-beta-1-MacOS", "3.6-beta-1-Windows" +"3.6-beta-2-Linux", +"3.6-beta-2-MacOS", +"3.6-beta-2-Windows" ]

1 0

[torbrowser/maint-2.4] Add 3.5.4 and 3.6-beta-2 as valid versions.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit fc393b4a3ea8766c064fed9e42ab18c3201f95ea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 8 14:48:58 2014 -0700 Add 3.5.4 and 3.6-beta-2 as valid versions. --- build-scripts/recommended-versions | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 6e4e306..8e1399c 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -2,7 +2,13 @@ "3.5.3-Linux", "3.5.3-MacOS", "3.5.3-Windows", +"3.5.4-Linux", +"3.5.4-MacOS", +"3.5.4-Windows", "3.6-beta-1-Linux", "3.6-beta-1-MacOS", "3.6-beta-1-Windows" +"3.6-beta-2-Linux", +"3.6-beta-2-MacOS", +"3.6-beta-2-Windows" ]

1 0

r26696: {website} Bump stable TBB version (website/trunk/include)
by Mike Perry 08 Apr '14

08 Apr '14

Author: mikeperry Date: 2014-04-08 21:46:45 +0000 (Tue, 08 Apr 2014) New Revision: 26696 Modified: website/trunk/include/versions.wmi Log: Bump stable TBB version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-04-08 20:21:26 UTC (rev 26695) +++ website/trunk/include/versions.wmi 2014-04-08 21:46:45 UTC (rev 26696) @@ -23,10 +23,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>3.5.3</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>3.5.4</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>3.6-beta-1</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>3.5.3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>3.5.4</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-1</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.5.3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.5.3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.5.4</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.5.4</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>3.6-beta-1</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>3.6-beta-1</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -47,7 +47,7 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>3.5.3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>3.5.4</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-torbrowserbundleosx32beta whitespace=delete>3.6-beta-1</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>

1 0

[tor/master] Make csiphash use the proper endian-converter on solaris
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 9ccedbece0052cf743d5e5703e1676cda6cab733 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 13:07:14 2014 -0400 Make csiphash use the proper endian-converter on solaris fixes bug 11426; bugfix on 0.2.5.3-alpha, where csiphash was introduced. --- changes/bug11426 | 3 +++ src/ext/csiphash.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/changes/bug11426 b/changes/bug11426 new file mode 100644 index 0000000..23b1e7d --- /dev/null +++ b/changes/bug11426 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix compilation on Solaris, which does not have <endian.h>. + Fixes bug 11426; bugfix on 0.2.5.3-alpha. diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 2a96f28..c247886 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -46,6 +46,10 @@ #elif defined(__APPLE__) # include <libkern/OSByteOrder.h> # define _le64toh(x) OSSwapLittleToHostInt64(x) +#elif defined(sun) || defined(__sun) +# include <sys/byteorder.h> +# define _le64toh(x) LE_64(x) + #else /* See: http://sourceforge.net/p/predef/wiki/Endianness/ */

1 0

[tor/master] Merge remote-tracking branch 'public/bug11426'
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 08ced4a7bf17f5c9d2868649dfa844248d15614e Merge: 689863d 9ccedbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 8 16:46:34 2014 -0400 Merge remote-tracking branch 'public/bug11426' changes/bug11426 | 3 +++ src/ext/csiphash.c | 4 ++++ 2 files changed, 7 insertions(+)

1 0

r26695: {website} update Windows bundles with Tor 0.2.4.21 and OpenSSL 1.0.1g (website/trunk/include)
by Erinn Clark 08 Apr '14

08 Apr '14

Author: erinn Date: 2014-04-08 20:21:26 +0000 (Tue, 08 Apr 2014) New Revision: 26695 Modified: website/trunk/include/versions.wmi Log: update Windows bundles with Tor 0.2.4.21 and OpenSSL 1.0.1g Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-04-08 00:58:58 UTC (rev 26694) +++ website/trunk/include/versions.wmi 2014-04-08 20:21:26 UTC (rev 26695) @@ -1,15 +1,15 @@ <define-tag version-stable whitespace=delete>0.2.4.21</define-tag> <define-tag version-alpha whitespace=delete>0.2.5.3-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.4.20</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.4.20</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.4.21</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.4.21</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.4.20</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.20</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.4.21</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.21</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.20-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.20-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.20-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.21-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.21-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.21-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.4.20</define-tag> <define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.20</define-tag>

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 08 Apr '14

08 Apr '14

commit 7a8ddc859c0bd6bfe4a43db1bd05c86d50779679 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 8 20:15:51 2014 +0000 Update translations for torbutton-torbuttonproperties --- nn/torbutton.properties | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nn/torbutton.properties b/nn/torbutton.properties index da6981f..c8a6d1e 100644 --- a/nn/torbutton.properties +++ b/nn/torbutton.properties @@ -1,11 +1,11 @@ -torbutton.button.tooltip.disabled = Enable Tor -torbutton.button.tooltip.enabled = Disable Tor -torbutton.panel.tooltip.disabled = Click to enable Tor -torbutton.panel.tooltip.enabled = Click to disable Tor -torbutton.panel.plugins.disabled = Click to enable plugins -torbutton.panel.plugins.enabled = Click to disable plugins -torbutton.panel.label.disabled = Tor Disabled -torbutton.panel.label.enabled = Tor Enabled +torbutton.button.tooltip.disabled = Slå på Tor +torbutton.button.tooltip.enabled = Slå av Tor +torbutton.panel.tooltip.disabled = Trykk for å slå på Tor +torbutton.panel.tooltip.enabled = Trykk for å slå av Tor +torbutton.panel.plugins.disabled = Tryjkk for å slå på programtillegg +torbutton.panel.plugins.enabled = Trykk for å slå av programtillegg +torbutton.panel.label.disabled = Tor avslått +torbutton.panel.label.enabled = Tor påslått extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n @@ -16,23 +16,23 @@ torbutton.popup.test.success = Tor proxy test successful! torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. -torbutton.panel.label.verified = Tor Verified +torbutton.panel.label.verified = Tor stadfesta torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? -torbutton.prefs.recommended = (recommended) +torbutton.prefs.recommended = (tilrådd) torbutton.prefs.optional = (optional) -torbutton.prefs.crucial = (crucial) -torbutton.popup.external.title = Load external content? +torbutton.prefs.crucial = (kritisk) +torbutton.popup.external.title = Laste eksternt innhald? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n -torbutton.popup.launch = Launch application -torbutton.popup.cancel = Cancel +torbutton.popup.launch = Last program +torbutton.popup.cancel = Avbryt torbutton.popup.dontask = Always launch applications from now on torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas? torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? torbutton.popup.captcha.always = Always perform this action from now on -torbutton.popup.redirect = Redirect +torbutton.popup.redirect = Vidaresend torbutton.popup.no_redirect = Don't Redirect torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? @@ -51,5 +51,5 @@ torbutton.popup.never_ask_again = Never ask me again canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. canvas.allow=Allow in the Future canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.never=Aldri for denne sida canvas.neverAccessKey=e

1 0