date:20150424

[tor-commits] [webwml/master] Update bridge docu to not recommend port 443 anymore

2015-04-24 Thread sebastian

commit 68fc46d8459f40b323306527fb7f166a04629dda
Author: Sebastian Hahn sebast...@torproject.org
Date:   Fri Apr 24 10:27:13 2015 +0200

Update bridge docu to not recommend port 443 anymore

This aids scanning resistance as per ticket #13996
---
 docs/en/bridges.wml |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index 7403235..6a82cc1 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -281,7 +281,7 @@
 the bridges.  Almost instantly, you'll receive a reply that includes:
 /p
 pre
-Here are your bridge:
+Here are your bridges:
 
  60.16.182.53:9001
  87.237.118.139:444
@@ -323,19 +323,13 @@
 your torrc file/a to be just these four lines:br
 precode
 SocksPort 0
-ORPort 443
+ORPort auto
 BridgeRelay 1
 Exitpolicy reject *:*
 /code/pre/li
 /ul
 /p
 
-pIf you get Could not bind to 0.0.0.0:443: Permission denied errors
-on startup, you'll need to pick a higher ORPort (e.g. 8080) or do a
-href=page 
docs/faq#HowcanImakemyrelayaccessibletopeoplestuckbehindrestrictivefirewallssome
-complex port forwarding/a.
-/p
-
 p
 When configured as a bridge, your server will bnot/b appear in the 
public
 Tor network.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Update mingw-w64

2015-04-24 Thread boklm

commit fd44344b97e53ab827f33fec9e9f7906b7dd2027
Author: Nicolas Vigier bo...@torproject.org
Date:   Fri Apr 24 12:28:13 2015 +0200

Update mingw-w64

The newer commit is required to build gecko-dev.
---
 projects/mingw-w64/config |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index f75e03f..c01bf8f 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -1,8 +1,7 @@
 # vim: filetype=yaml
 filename: '[% project %]-[% c(version) %]-[% c(var/build_id) %].tar.gz'
 git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64
-#git_hash: 469ed5d227202b373409c8a3b4c1358be39b9983
-git_hash: bcd8f3f6d3bd4a227e8537010a869ddde711b8f6
+git_hash: 85b403445b2308fa6277aa26446da790866fe052
 version: '[% c(abbrev) %]'
 remote_docker: 1
 lsb_release:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Add patch to fix gecko-dev build with mingw-w64

2015-04-24 Thread boklm

commit 26ce394f58ec33f1b488f6215cb6980f2d1b9a4c
Author: Nicolas Vigier bo...@torproject.org
Date:   Fri Apr 24 13:06:14 2015 +0200

Add patch to fix gecko-dev build with mingw-w64
---
 projects/instantbird/config|2 ++
 .../fix-versionhelpers.h-include.mozpatch  |   36 
 2 files changed, 38 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 5e88e3f..e4e3816 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -74,6 +74,8 @@ input_files:
   - filename: branding/default48.png
   - filename: fix-mingw-build.patch
 enable: '[% c(var/windows) %]'
+  - filename: fix-versionhelpers.h-include.mozpatch
+enable: '[% c(var/windows) %]'
   - filename: 'mozconfig-[% c(var/osname) %]'
 name: mozconfig
   - name: python
diff --git a/projects/instantbird/fix-versionhelpers.h-include.mozpatch 
b/projects/instantbird/fix-versionhelpers.h-include.mozpatch
new file mode 100644
index 000..860db81
--- /dev/null
+++ b/projects/instantbird/fix-versionhelpers.h-include.mozpatch
@@ -0,0 +1,36 @@
+From cba17f0febd0978adf15d4a6cf21b4fbcb979884 Mon Sep 17 00:00:00 2001
+From: Nicolas Vigier bo...@mars-attacks.org
+Date: Fri, 24 Apr 2015 12:20:57 +0200
+Subject: [PATCH] Fix versionhelpers.h include
+
+---
+ media/gmp-clearkey/0.1/ClearKeySessionManager.cpp | 2 +-
+ media/gmp-clearkey/0.1/WMFUtils.cpp   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp 
b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
+index 1a9b96bb26ae..1cf9f351a1d0 100644
+--- a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
 b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
+@@ -26,7 +26,7 @@
+ #include gmp-task-utils.h
+ #if defined(ENABLE_WMF)
+ #include WMFUtils.h
+-#include VersionHelpers.h
++#include versionhelpers.h
+ #endif
+ 
+ #include assert.h
+diff --git a/media/gmp-clearkey/0.1/WMFUtils.cpp 
b/media/gmp-clearkey/0.1/WMFUtils.cpp
+index 6f2204a99223..afa651973375 100644
+--- a/media/gmp-clearkey/0.1/WMFUtils.cpp
 b/media/gmp-clearkey/0.1/WMFUtils.cpp
+@@ -16,7 +16,7 @@
+ 
+ #include WMFUtils.h
+ #include ClearKeyUtils.h
+-#include VersionHelpers.h
++#include versionhelpers.h
+ 
+ #include stdio.h
+ 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Kludge include.am to work with automake 1.12

2015-04-24 Thread nickm

commit d579d751dc03c4a2f8dd31b6928a88bdc10d49a0
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Apr 24 08:41:53 2015 -0400

Kludge include.am to work with automake 1.12

The SH_LOG_COMPILER feature doesn't work with older automakes, and
those are still in use in many environments we want to support
development on, like Debian Stable.

Instead, use autoconf substitution to fill out the shebang lines on
the shell scripts, and an intermediate make target to make them
executable.

This is a bugfix on the patches for #15344.  Bug not in any released
tor.
---
 src/test/include.am  |   22 +-
 src/test/test_bt.sh.in   |2 +-
 src/test/test_ntor.sh.in |2 +-
 src/test/test_zero_length_keys.sh.in |2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/test/include.am b/src/test/include.am
index 3c9eed8..c693544 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -1,12 +1,24 @@
-TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
-   src/test/test_zero_length_keys.sh
+
+TESTSCRIPTS = src/test/test_zero_length_keys.sh
 
 if USEPYTHON
-TESTS += src/test/test_ntor.sh src/test/test_bt.sh
+TESTSCRIPTS += src/test/test_ntor.sh src/test/test_bt.sh
 endif
 
-TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = $(SHELL)
+TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
+   $(TESTSCRIPTS)
+
+### 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.
+###
+# TEST_EXTENSIONS = .sh
+# SH_LOG_COMPILER = $(SHELL)
+
+check-am: set-test-permissions
+
+set-test-permissions:
+   chmod 755 $(TESTSCRIPTS)
+
 
 noinst_PROGRAMS+= src/test/bench
 if UNITTESTS_ENABLED
diff --git a/src/test/test_bt.sh.in b/src/test/test_bt.sh.in
index d249875..ca8be96 100755
--- a/src/test/test_bt.sh.in
+++ b/src/test/test_bt.sh.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Test backtrace functionality.
 
 exitcode=0
diff --git a/src/test/test_ntor.sh.in b/src/test/test_ntor.sh.in
index 5fea8ce..be35384 100755
--- a/src/test/test_ntor.sh.in
+++ b/src/test/test_ntor.sh.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Validate Tor's ntor implementation.
 
 exitcode=0
diff --git a/src/test/test_zero_length_keys.sh.in 
b/src/test/test_zero_length_keys.sh.in
index 47467ba..d1492d5 100755
--- a/src/test/test_zero_length_keys.sh.in
+++ b/src/test/test_zero_length_keys.sh.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SHELL@
 # Check that tor regenerates keys when key files are zero-length
 
 exitcode=0

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] mozilla: also use master for Windows builds

2015-04-24 Thread boklm

commit 5eea5ee71efc9940e81be3d22b01e6af28336cf1
Author: Nicolas Vigier bo...@torproject.org
Date:   Fri Apr 24 15:43:58 2015 +0200

mozilla: also use master for Windows builds
---
 projects/mozilla/config |6 --
 1 file changed, 6 deletions(-)

diff --git a/projects/mozilla/config b/projects/mozilla/config
index a7dadb9..ea23187 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -9,9 +9,3 @@ src: |
 steps:
   src:
 filename: mozilla-[% c('version') %]-src.tar.gz
-
-targets:
-windows-i686:
-# master does not currently build with mingw-w64, so we are
-# staying with an older commit until the problem is fixed.
-git_hash: efd5e9084a29e91c05b1fd9b26a56f424b73ac50

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/gettor] Update translations for gettor

2015-04-24 Thread translation

commit 9056e7573979c69b1d5e428c013782f159728d4a
Author: Translation commit bot translat...@torproject.org
Date:   Fri Apr 24 13:15:05 2015 +

Update translations for gettor
---
 es_MX/gettor.po |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/es_MX/gettor.po b/es_MX/gettor.po
index b008e6a..75fc6f9 100644
--- a/es_MX/gettor.po
+++ b/es_MX/gettor.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ciclovia Stiltskin bluesh...@yahoo.com, 2015
 # Luis Gerardo Flores Ortiz luisgflo...@hotmail.com, 2015
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2015-02-06 23:40+\n
-Last-Translator: Luis Gerardo Flores Ortiz luisgflo...@hotmail.com\n
+PO-Revision-Date: 2015-04-24 13:03+\n
+Last-Translator: Ciclovia Stiltskin bluesh...@yahoo.com\n
 Language-Team: Spanish (Mexico) 
(http://www.transifex.com/projects/p/torproject/language/es_MX/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -129,14 +130,14 @@ msgstr Si no selecciona ningÃºn idioma, recibirÃ¡ la 
versiÃ³n en InglÃ©s.
 msgid 
 SMALLER SIZED PACKAGES\n
 ==
-msgstr 
+msgstr PAQUETES DE TAMAÃOS MAS PEQUEÃOS
 
 #: lib/gettor/i18n.py:97
 msgid 
 If your bandwith is low or your provider doesn't allow you to\n
 receive large attachments in your email, GetTor can send you several\n
 small packages instead of one big one.
-msgstr 
+msgstr Si su banda ancha es baja o si su proveedor no le permite\n recibir 
archivos adjuntos de gran tamaÃ±o en su correo electÃ³nico, GetTor puede 
enviarle paquetes pequeÃ±os en vez de uno grande. 
 
 #: lib/gettor/i18n.py:101
 msgid 
@@ -145,23 +146,23 @@ msgid 
 \n
 windows\n
 split
-msgstr 
+msgstr Simplemente incluya la palabra \split\ de manera aislada en un nuevo 
renglÃ³n  (Â¡esta parte\nes importante!) asÃ como tambiÃ©n:\n\nwindows\nsplit 
 
 #: lib/gettor/i18n.py:107
 msgid 
 Sending this text in an email to GetTor will cause it to send you \n
 the Tor Browser Bundle in a number of 1,4MB attachments.
-msgstr 
+msgstr Mandar este texto por correo electrÃ³nico a GetTor producirÃ¡ que se 
le envÃe el Paquete Tor Browser en una cantidad de adjuntos de 1,4MB
 
 #: lib/gettor/i18n.py:110
 msgid 
 After having received all parts, you need to re-assemble them to \n
 one package again. This is done as follows:
-msgstr 
+msgstr DespuÃ©s de haber recibido todas las partes, usted necesita 
reensamblarlas a un solo paquete nuevamente. Esto se realiza de la siguiente 
manera:
 
 #: lib/gettor/i18n.py:113
 msgid 1.) Save all received attachments into one folder on your disk.
-msgstr 
+msgstr 1.) Guarde todos los archivos adjuntos recibidos en una carpeta en su 
disco duro.
 
 #: lib/gettor/i18n.py:115
 msgid 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Update changelog and versions

2015-04-24 Thread gk

commit 3e6e3159c90cdfe33c38ed698d702ec97fcf49cc
Author: Georg Koppen g...@torproject.org
Date:   Fri Apr 24 18:26:16 2015 +

Update changelog and versions
---
 Bundle-Data/Docs/ChangeLog.txt |6 --
 gitian/versions|6 +++---
 gitian/versions.alpha  |6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index ee17952..ce63883 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -3,7 +3,7 @@ Tor Browser 4.5 -- Apr 28 2015
* Update Tor to 0.2.6.7 with additional patches:
  * Bug 15482: Reset timestamp_dirty each time a SOCKSAuth circuit is used
* Update NoScript to 2.6.9.22
-   * Update HTTPS-Everywhere to 5.0.2
+   * Update HTTPS-Everywhere to 5.0.3
  * Bug 15689: Resume building HTTPS-Everywhere from git tags
* Update meek to 0.17
* Update obfs4proxy to 0.0.5
@@ -12,18 +12,20 @@ Tor Browser 4.5 -- Apr 28 2015
  * Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked
  * Bug 13576: Don't strip bridge from the middle of bridge lines
  * Bug 15657: Display the host:port of any connection faiures in bootstrap
-   * Update Torbutton to 1.9.2.1
+   * Update Torbutton to 1.9.2.2
  * Bug 15562: Bind SharedWorkers to thirdparty pref
  * Bug 15533: Restore default security level when restoring defaults
  * Bug 15510: Close Tor Circuit UI control port connections on New Identity
  * Bug 15472: Make node text black in circuit status UI
  * Bug 15502: Wipe blob URIs on New Identity
+ * Bug 15795: Some security slider prefs do not trigger custom checkbox
  * Bug 14429: Disable automatic window resizing for now
* Bug 4100: Raise HTTP Keep-Alive back to 115 second default
* Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting
* Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism
* Bugs 14716+13254: Fix issues with HTTP Auth usage and TLS connection info 
display
* Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access
+   * Bug 15794: Crash on some pages with SVG images if SVG is disabled
* Bug 15562: Disable Javascript SharedWorkers due to third party tracking
* Bug 15757: Disable Mozilla video statistics API extensions
* Bug 15758: Disable Device Sensor APIs
diff --git a/gitian/versions b/gitian/versions
index d490333..26b116b 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -8,11 +8,11 @@ FIREFOX_VERSION=31.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3
 TOR_TAG=tor-0.2.6.7
 TORLAUNCHER_TAG=0.2.7.4
-TORBUTTON_TAG=1.9.2.1
-HTTPSE_TAG=5.0.2
+TORBUTTON_TAG=1.9.2.2
+HTTPSE_TAG=5.0.3
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 7f323be..86e163d 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,11 +8,11 @@ FIREFOX_VERSION=31.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3
 TOR_TAG=tor-0.2.6.7
 TORLAUNCHER_TAG=0.2.7.4
-TORBUTTON_TAG=1.9.2.1
-HTTPSE_TAG=5.0.2
+TORBUTTON_TAG=1.9.2.2
+HTTPSE_TAG=5.0.3
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Static check citing duplicate 'test'

2015-04-24 Thread atagar

commit 888488f3ea25ca71b71e34c8add5bb5f3a5a472e
Author: Damian Johnson ata...@torproject.org
Date:   Fri Apr 24 09:04:34 2015 -0700

Static check citing duplicate 'test'

This one I can't repro here but on another system saw...

  STATIC CHECKS

  * /tmp/stem/test/util.py
  line 130  - redefinition of unused 'test' from line 42 test = 
module_prefix.rsplit('.', 1)[1]

Trivial to sidestep.
---
 test/util.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/util.py b/test/util.py
index 87fc47e..533dcc8 100644
--- a/test/util.py
+++ b/test/util.py
@@ -127,8 +127,8 @@ def _get_tests(modules, module_prefix):
   elif module_prefix.startswith(module):
 # single test for this module
 
-test = module_prefix.rsplit('.', 1)[1]
-yield '%s.%s' % (import_name, test)
+test_module = module_prefix.rsplit('.', 1)[1]
+yield '%s.%s' % (import_name, test_module)
 
 
 def get_prereq(target):

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Update changelog and bump version

2015-04-24 Thread gk

commit 827995a19f49894cc0e49ed96d11ac716dd51e90
Author: Georg Koppen g...@torproject.org
Date:   Fri Apr 24 18:02:13 2015 +

Update changelog and bump version
---
 src/CHANGELOG   |3 +++
 src/install.rdf |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 4a3353d..9ec02ae 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,6 @@
+1.9.2.2:
+ * Bug 15795: Some security slider prefs do not trigger custom checkbox
+
 1.9.2.1:
  * Bug 14429: Disable window resizing for now.
 
diff --git a/src/install.rdf b/src/install.rdf
index 6af4e9b..90d12b3 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
 em:nameTorbutton/em:name
 em:creatorMike Perry/em:creator
 em:idtorbut...@torproject.org/em:id
-em:version1.9.2.0/em:version
+em:version1.9.2.2/em:version
 
em:homepageURLhttps://www.torproject.org/projects/torbrowser.html.en/em:homepageURL
 
em:optionsURLchrome://torbutton/content/preferences.xul/em:optionsURL
 em:iconURLchrome://torbutton/skin/tor.png/em:iconURL

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 15795: Some security slider prefs do not trigger custom checkbox.

2015-04-24 Thread gk

commit cacd8c67be59359b2a9bdf8a2cf2a341401cc77e
Author: Kathy Brade br...@pearlcrescent.com
Date:   Fri Apr 24 11:34:54 2015 -0400

Bug 15795: Some security slider prefs do not trigger custom checkbox.

Also monitor the following prefs. so that all manual changes cause
the security slider's custom checkbox to be toggled:
  mathml.disabled
  network.jar.block-remote-files
  svg.in-content.enabled
---
 src/chrome/content/torbutton.js |7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 7d229dd..21e567e 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -122,11 +122,14 @@ var torbutton_unique_pref_observer =
 this._branch.addObserver(extensions.torbutton, this, false);
 this._branch.addObserver(network.proxy, this, false);
 this._branch.addObserver(network.cookie, this, false);
+this._branch.addObserver(network.jar, this, false);
 this._branch.addObserver(browser.privatebrowsing.autostart, this, 
false);
 this._branch.addObserver(javascript, this, false);
 this._branch.addObserver(gfx, this, false);
 this._branch.addObserver(noscript, this, false);
 this._branch.addObserver(media, this, false);
+this._branch.addObserver(mathml, this, false);
+this._branch.addObserver(svg, this, false);
 
 // We observe xpcom-category-entry-added for plugins w/ 
Gecko-Content-Viewers
 var observerService = Cc[@mozilla.org/observer-service;1].
@@ -140,11 +143,14 @@ var torbutton_unique_pref_observer =
 this._branch.removeObserver(extensions.torbutton, this);
 this._branch.removeObserver(network.proxy, this);
 this._branch.removeObserver(network.cookie, this);
+this._branch.removeObserver(network.jar, this);
 this._branch.removeObserver(browser.privatebrowsing.autostart, this);
 this._branch.removeObserver(javascript, this);
 this._branch.removeObserver(gfx, this);
 this._branch.removeObserver(noscript, this);
 this._branch.removeObserver(media, this);
+this._branch.removeObserver(mathml, this);
+this._branch.removeObserver(svg, this);
 
 var observerService = Cc[@mozilla.org/observer-service;1].
 getService(Ci.nsIObserverService);
@@ -244,6 +250,7 @@ var torbutton_unique_pref_observer =
 case gfx.font_rendering.graphite.enabled:
 case noscript.globalHttpsWhitelist:
 case noscript.global:
+case svg.in-content.enabled:
 // |m_tb_slider_update| is only set if the user updated a
 // preference under control of the security slider via the
 // slider on the Torbutton dialog. This in turn means we can



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Add screenshots for MacOS install instructions (#14838).

2015-04-24 Thread mikeperry

commit 8c308cd6ef7c95b28cf0fc2c4afa1ebf601cd200
Author: Mike Perry mikeperry-...@torproject.org
Date:   Fri Apr 24 17:17:17 2015 -0700

Add screenshots for MacOS install instructions (#14838).
---
 images/tbb-macosx-step-1.png |  Bin 0 - 21334 bytes
 images/tbb-macosx-step-2.png |  Bin 0 - 20451 bytes
 images/tbb-macosx-step-3.png |  Bin 0 - 13846 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/tbb-macosx-step-1.png b/images/tbb-macosx-step-1.png
new file mode 100644
index 000..2dd11fc
Binary files /dev/null and b/images/tbb-macosx-step-1.png differ
diff --git a/images/tbb-macosx-step-2.png b/images/tbb-macosx-step-2.png
new file mode 100644
index 000..40f6f92
Binary files /dev/null and b/images/tbb-macosx-step-2.png differ
diff --git a/images/tbb-macosx-step-3.png b/images/tbb-macosx-step-3.png
new file mode 100644
index 000..27e98cf
Binary files /dev/null and b/images/tbb-macosx-step-3.png differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Add screenshots that show how to run Tor Browser on OS X.

2015-04-24 Thread mikeperry

commit 3b647388ec91070e307a9e508f2d7ac597c799d8
Author: David Fifield da...@bamsoftware.com
Date:   Thu Feb 12 12:29:32 2015 -0800

Add screenshots that show how to run Tor Browser on OS X.

https://trac.torproject.org/projects/tor/ticket/14838
---
 css/layout.css|   14 ++
 download/en/download-easy.wml |   18 ++
 2 files changed, 32 insertions(+)

diff --git a/css/layout.css b/css/layout.css
index 4e305f7..54d225b 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -660,6 +660,20 @@ table tr img {
padding-bottom: 8px;
 }
 
+.howto th, .howto td {
+   padding: 2px;
+}
+
+.howto th {
+   font-weight: bold;
+   text-align: center;
+}
+
+.howto img {
+   border: 0;
+   margin: 0;
+}
+
 #download-donate {
background-attachment: scroll;
background-clip: border-box;
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 727a874..0868a0d 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -75,6 +75,24 @@
  /form
  p class=alt-dlNot Using Mac? Download for a 
href=#windowsWindows/a or a href=#linuxGNU/Linux/a/p
 /div
+!-- To update these screenshots: Press Command-Shift-4 and then 
Spacebar, then click on the window. See #14838. --
+table class=howto
+  tr
+th1. Install/th
+th2. Control-click/th
+th3. Open/th
+  /tr
+  tr
+tdimg src=$(IMGROOT)/tbb-macosx-step-1.png alt=Screenshot 
showing the contents of the Tor Browser dmg file./td
+tdimg src=$(IMGROOT)/tbb-macosx-step-2.png alt=Screenshot of 
the Applications folder with the Tor Browser icon./td
+tdimg src=$(IMGROOT)/tbb-macosx-step-3.png alt=Dialog 
offering to open Tor Browser./td
+  /tr
+  tr
+tdDrag the Tor Browser icon to the Applications folder and open 
the Applications folder./td
+tdControl-click on the Tor Browser icon (click the mouse button 
while pressing the Control key on the keyboard) and choose 
ldquo;Openrdquo;./td
+tdClick ldquo;Openrdquo; on the next screen./td
+  /tr
+/table
   /div
 !-- START LINUX --
   div id=linux class=easy linux

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Remove statement about Mac bundles needing no installation.

2015-04-24 Thread mikeperry

commit 1e8c48750462a30d2c7b11e5de2dbee70f97fda9
Author: Mike Perry mikeperry-...@torproject.org
Date:   Fri Apr 24 17:24:45 2015 -0700

Remove statement about Mac bundles needing no installation.
---
 download/en/download-easy.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 0868a0d..1d47828 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -61,7 +61,7 @@
  div class=desc
h2Tor Browser for Mac/h2
emVersion version-torbrowserbundleosx32 - OS X (10.6+)/em a 
href=https://blog.torproject.org/category/tags/tbb;Read the release 
announcements!/a
-   pEverything you need to safely browse the Internet. This package 
requires no installation. Just extract it and run.br /a href=page 
projects/torbrowserLearn more raquo;/a/p
+   pEverything you need to safely browse the Internet.br /a 
href=page projects/torbrowserLearn more raquo;/a/p
  /div
  form class=downloads
a class=button osx-tbb 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx32-osx32_lang.dmgspan
 class=strongDownload/spanspan 
class=normalbutton-osx-tbb32/span/a

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Installation test used python2 style print statment

2015-04-24 Thread atagar

commit 5d5944bbffc1a3d12b54bd478f5a433e79bbe41e
Author: Damian Johnson ata...@torproject.org
Date:   Fri Apr 24 08:32:46 2015 -0700

Installation test used python2 style print statment

Oops, slipped my mind that this was python2 specific.
---
 test/integ/installation.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integ/installation.py b/test/integ/installation.py
index 3dfbd27..c500612 100644
--- a/test/integ/installation.py
+++ b/test/integ/installation.py
@@ -27,7 +27,7 @@ class TestInstallation(unittest.TestCase):
   if len(site_packages_paths) != 1:
 self.fail('We should only have a single site-packages directory, but 
instead had: %s' % site_packages_paths)
 
-  self.assertEqual(stem.__version__, stem.util.system.call(['python', 
'-c', import sys;sys.path.insert(0, '%s');import stem;print stem.__version__ 
% site_packages_paths[0]])[0])
+  self.assertEqual(stem.__version__, stem.util.system.call(['python', 
'-c', import sys;sys.path.insert(0, '%s');import stem;print(stem.__version__) 
% site_packages_paths[0]])[0])
 finally:
   shutil.rmtree('/tmp/stem_test')
   os.chdir(original_cwd)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Correct installation test for 64bit platforms

2015-04-24 Thread atagar

commit 2b44a15dd45ddec2085dfb2769604ef3f42049dd
Author: Damian Johnson ata...@torproject.org
Date:   Fri Apr 24 08:17:01 2015 -0700

Correct installation test for 64bit platforms

On 64bit platforms the 'lib' directory is called 'lib64' instead...

  /tmp/stem_test/lib64/python3.3/site-packages/stem-1.3.0_dev-py3.3.egg-info

Caught by toralf.
---
 test/integ/installation.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integ/installation.py b/test/integ/installation.py
index f0ce9ed..3dfbd27 100644
--- a/test/integ/installation.py
+++ b/test/integ/installation.py
@@ -22,7 +22,7 @@ class TestInstallation(unittest.TestCase):
 try:
   os.chdir(base_directory)
   stem.util.system.call('python setup.py install --prefix /tmp/stem_test')
-  site_packages_paths = glob.glob('/tmp/stem_test/lib/*/site-packages')
+  site_packages_paths = glob.glob('/tmp/stem_test/lib*/*/site-packages')
 
   if len(site_packages_paths) != 1:
 self.fail('We should only have a single site-packages directory, but 
instead had: %s' % site_packages_paths)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-04-24 Thread translation

commit 88eb53b979f441530f81e9daf642ffc989904fa1
Author: Translation commit bot translat...@torproject.org
Date:   Fri Apr 24 16:45:04 2015 +

Update translations for bridgedb
---
 nb/LC_MESSAGES/bridgedb.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 44e1842..7012760 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -5,6 +5,7 @@
 # Translators:
 # Allan NordhÃ¸y ep...@anotheragency.no, 2014
 # Harald haarektr...@gmail.com, 2014
+# Kristian Andre Henriksen kris.andr...@gmail.com, 2015
 # lateralus, 2013
 # Per Thorsheim transi...@thorsheim.net, 2015
 # thor574 thor.hov...@gmail.com, 2014
@@ -12,8 +13,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-04-19 08:23+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2015-04-24 16:32+\n
+Last-Translator: Kristian Andre Henriksen kris.andr...@gmail.com\n
 Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/projects/p/torproject/language/nb/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -207,7 +208,7 @@ msgid 
 To enter bridges into Tor Browser, first go to the %s Tor Browser download\n
 page %s and then follow the instructions there for downloading and starting\n
 Tor Browser.
-msgstr 
+msgstr For Ã¥ sette opp broer i Tor Browser, fÃ¸rst gÃ¥ til %s Tor Browser 
download\nsiden %s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor 
Browser.
 
 #. TRANSLATORS: Please DO NOT translate Tor.
 #: lib/bridgedb/strings.py:126

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-24 Thread translation

commit a9022a0bce90e45b0c70fc54cf87f97384ee476b
Author: Translation commit bot translat...@torproject.org
Date:   Fri Apr 24 17:15:54 2015 +

Update translations for tor_animation
---
 nb.srt |   70 +++-
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/nb.srt b/nb.srt
index 78c998d..1a26ed0 100644
--- a/nb.srt
+++ b/nb.srt
@@ -1,11 +1,10 @@
 1
 00:00:00,660 -- 00:00:02,780
-We've gotten very used to the Internet.
+Vi er blitt veldig avhengig av Internett.
 
 2
 00:00:03,120 -- 00:00:07,700
-We are constantly sharing information
-about ourselves and our private lives:
+Vi deler konstant informasjon, om oss selv og privatlivene vÃ¥res.
 
 3
 00:00:08,000 -- 00:00:09,960
@@ -17,22 +16,21 @@ places we go, and the stuff we read.
 
 5
 00:00:13,280 -- 00:00:14,640
-Let me explain it better.
+La meg utdype det litt nÃ¦rmere.
 
 6
 00:00:14,920 -- 00:00:17,740
-Right at this moment,
-if someone attempts to look you up,
+Om noen i dette Ã¸yeblikket har bestemt seg for Ã¥ spore deg,
 
 7
 00:00:18,060 -- 00:00:22,480
-they'll see your real identity,
-precise location, operating system,
+vil de kunne identifisere deg,
+se din nÃ¸yaktig posisjon, hvilket operativ system du bruker,  
 
 8
 00:00:22,800 -- 00:00:26,500
-all the sites you've visited,
-the browser you use to surf the web,
+alle sidene du har vÃ¦rt innom,
+hvilken nettleser som blir brukt til Ã¥ surfet med,
 
 9
 00:00:26,700 -- 00:00:29,140
@@ -40,126 +38,126 @@ and so much more information
 about you and your life
 
 10
-00:00:29,620 -- 00:00:32,460
+00:00:29,200 -- 00:00:31,500
 which you probably didn't mean
 to share with unknown strangers,
 
 11
-00:00:32,920 -- 00:00:35,840
+00:00:31,700 -- 00:00:34,000
 who could easily use this data
 to exploit you.
 
 12
-00:00:36,220 -- 00:00:38,120
+00:00:34,500 -- 00:00:37,000
 But not if you're using Tor!
 
 13
-00:00:39,140 -- 00:00:42,840
+00:00:37,140 -- 00:00:40,840
 Tor Browser protects our privacy
 and identity on the Internet.
 
 14
-00:00:43,560 -- 00:00:46,760
+00:00:41,560 -- 00:00:44,760
 Tor secures your connection
 with three layers of encryption
 
 15
-00:00:46,940 -- 00:00:51,760
+00:00:44,940 -- 00:00:49,760
 and passes it through three voluntarily
 operated servers around the world,
 
 16
-00:00:52,280 -- 00:00:55,520
+00:00:50,280 -- 00:00:53,520
 which enables us to communicate
 anonymously over the Internet.
 
 17
-00:00:58,560 -- 00:01:00,280
+00:00:56,560 -- 00:00:58,280
 Tor also protects our data
 
 18
-00:01:00,400 -- 00:01:03,900
+00:00:58,400 -- 00:01:01,900
 against corporate or government targeted
 and mass surveillance.
 
 19
-00:01:04,880 -- 00:01:09,340
+00:01:02,880 -- 00:01:07,340
 Perhaps you live in a repressive country
 which tries to control and surveil the Internet.
 
 20
-00:01:09,900 -- 00:01:13,800
+00:01:07,900 -- 00:01:11,800
 Or perhaps you don't want big corporations
 taking advantage of your personal information.
 
 21
-00:01:14,880 -- 00:01:17,640
+00:01:12,880 -- 00:01:15,640
 Tor makes all of its users
 to look the same
 
 22
-00:01:17,920 -- 00:01:20,800
+00:01:15,920 -- 00:01:18,800
 which confuses the observer
 and makes you anonymous.
 
 23
-00:01:21,500 -- 00:01:24,980
+00:01:19,500 -- 00:01:22,980
 So, the more people use the Tor network,
 the stronger it gets
 
 24
-00:01:25,140 -- 00:01:29,800
+00:01:23,140 -- 00:01:27,800
 as it's easier to hide in a crowd
 of people who look exactly the same.
 
 25
-00:01:30,700 -- 00:01:33,240
+00:01:28,700 -- 00:01:31,240
 You can bypass the censorship
 without being worried about
 
 26
-00:01:33,400 -- 00:01:36,100
+00:01:31,400 -- 00:01:34,100
 the censor knowing what you do
 on the Internet.
 
 27
-00:01:38,540 -- 00:01:41,440
+00:01:36,540 -- 00:01:39,440
 The ads won't follow you
 everywhere for months,
 
 28
-00:01:41,640 -- 00:01:43,300
+00:01:39,640 -- 00:01:41,300
 starting when you first
 clicked on a product.
 
 29
-00:01:45,880 -- 00:01:49,380
+00:01:43,880 -- 00:01:47,380
 By using Tor, the sites you visit
 won't even know who you are,
 
 30
-00:01:49,540 -- 00:01:51,760
+00:01:47,540 -- 00:01:49,760
 from what part of the world
 you're visiting them,
 
 31
-00:01:51,920 -- 00:01:53,920
+00:01:49,920 -- 00:01:51,920
 unless you login and tell them so.
 
 32
-00:01:56,200 -- 00:01:57,840
+00:01:54,200 -- 00:01:55,840
 By downloading and using Tor,
 
 33
-00:01:58,200 -- 00:02:00,560
+00:01:56,200 -- 00:01:58,560
 you can protect the people
 who need anonymity,
 
 34
-00:02:00,880 -- 00:02:03,640
+00:01:58,880 -- 00:02:01,640
 like activists, journalists and bloggers.
 
 35
-00:02:04,000 -- 00:02:09,000
+00:02:02,000 -- 00:02:07,000
 Download and use Tor! Or run a relay!
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2015-04-24 Thread translation

commit 38db7e6d698d70e80bbe106382278c46b0389617
Author: Translation commit bot translat...@torproject.org
Date:   Fri Apr 24 16:45:08 2015 +

Update translations for bridgedb_completed
---
 nb/LC_MESSAGES/bridgedb.po |   35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 1d5603e..7012760 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Allan NordhÃ¸y comradeki...@gmail.com, 2014
+# Allan NordhÃ¸y ep...@anotheragency.no, 2014
 # Harald haarektr...@gmail.com, 2014
+# Kristian Andre Henriksen kris.andr...@gmail.com, 2015
 # lateralus, 2013
 # Per Thorsheim transi...@thorsheim.net, 2015
 # thor574 thor.hov...@gmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
-POT-Creation-Date: 2015-02-03 03:24+\n
-PO-Revision-Date: 2015-02-24 13:06+\n
-Last-Translator: Per Thorsheim transi...@thorsheim.net\n
+Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
+PO-Revision-Date: 2015-04-24 16:32+\n
+Last-Translator: Kristian Andre Henriksen kris.andr...@gmail.com\n
 Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/projects/p/torproject/language/nb/)\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:122
+#: lib/bridgedb/HTTPServer.py:107
 msgid Sorry! Something went wrong with your request.
 msgstr Dette var leit! Noe gikk galt med forespÃ¸rselen din.
 
@@ -205,26 +205,27 @@ msgstr Hvordan starte med bruk av dine broer
 #: lib/bridgedb/strings.py:121
 #, python-format
 msgid 
-To enter bridges into Tor Browser, follow the instructions on the %s Tor\n
-Browser download page %s to start Tor Browser.
-msgstr For Ã¥ oppfÃ¸re broer i Tor-nettleseren, fÃ¸lg instruksjonene pÃ¥ %s 
Tor\nnettleser nedlastingsside %s for Ã¥ starte Tor-nettleser.
+To enter bridges into Tor Browser, first go to the %s Tor Browser download\n
+page %s and then follow the instructions there for downloading and starting\n
+Tor Browser.
+msgstr For Ã¥ sette opp broer i Tor Browser, fÃ¸rst gÃ¥ til %s Tor Browser 
download\nsiden %s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor 
Browser.
 
 #. TRANSLATORS: Please DO NOT translate Tor.
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
 msgid 
 When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n
 the wizard until it asks:
 msgstr NÃ¥r 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk 
pÃ¥ 'oppsett' og fÃ¸lg\nveiviseren til den forespÃ¸r:
 
 #. TRANSLATORS: Please DO NOT translate Tor.
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
 msgid 
 Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n
 to the Tor network?
 msgstr Sensurerer, eller blokkerer pÃ¥ annen mÃ¥te, din internetttilbyder 
(ISP) tilkoblinger\ntil Tor-nettverket?
 
 #. TRANSLATORS: Please DO NOT translate Tor.
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
 msgid 
 Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n
 paste the bridge lines into the text input box. Finally, click 'Connect', 
and\n
@@ -232,29 +233,29 @@ msgid 
 button in the 'Tor Network Settings' wizard for further assistance.
 msgstr Velg 'Ja' og klikk sÃ¥ 'Neste'. For Ã¥ sette opp nye broer, kopier 
og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu 
burde vÃ¦re klar til kamp! Hvis du fÃ¥r problemer, trykk 'Hjelp'\n-knappen i 
\Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp.
 
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
 msgid Displays this message.
 msgstr Vis denne meldingen.
 
 #. TRANSLATORS: Please try to make it clear that vanilla here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. plain-ol'-vanilla bridges.
-#: lib/bridgedb/strings.py:145
+#: lib/bridgedb/strings.py:146
 msgid Request vanilla bridges.
 msgstr ForespÃ¸rr broer med fabrikkoppsett.
 
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
 msgid Request IPv6 bridges.
 msgstr EtterspÃ¸r IPv6-broer.
 
 #. TRANSLATORS: Please DO NOT translate the word the word TYPE.
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
 msgid Request a Pluggable Transport by TYPE.
 msgstr EtterspÃ¸rr pluggbar transport etter TYPE.
 
 #. TRANSLATORS: Please DO NOT translate BridgeDB.
 #. TRANSLATORS: Please DO NOT translate GnuPG.
-#: lib/bridgedb/strings.py:151
+#:

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2015-04-24 Thread translation

commit 14bfd59b772e53c872569d4a5d058d6b2a605397
Author: Translation commit bot translat...@torproject.org
Date:   Fri Apr 24 17:45:07 2015 +

Update translations for bridgedb_completed
---
 nb/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 7012760..b3c80f0 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-04-24 16:32+\n
+PO-Revision-Date: 2015-04-24 17:20+\n
 Last-Translator: Kristian Andre Henriksen kris.andr...@gmail.com\n
 Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/projects/p/torproject/language/nb/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-04-24 Thread translation

commit ece63dcb9a15bb08445c802646861c280f62b26d
Author: Translation commit bot translat...@torproject.org
Date:   Fri Apr 24 17:45:03 2015 +

Update translations for bridgedb
---
 nb/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 7012760..b3c80f0 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-04-24 16:32+\n
+PO-Revision-Date: 2015-04-24 17:20+\n
 Last-Translator: Kristian Andre Henriksen kris.andr...@gmail.com\n
 Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/projects/p/torproject/language/nb/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] 'run_tests.py --help' still mentioned the '--style' argument

2015-04-24 Thread atagar

commit 710774be7962eda6cff73a5ec45b42f23db2d782
Author: Damian Johnson ata...@torproject.org
Date:   Fri Apr 24 08:39:55 2015 -0700

'run_tests.py --help' still mentioned the '--style' argument

Caught by wop_.
---
 test/settings.cfg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/settings.cfg b/test/settings.cfg
index 79fec01..c963630 100644
--- a/test/settings.cfg
+++ b/test/settings.cfg
@@ -33,7 +33,7 @@ msg.help
 |Usage run_tests.py [OPTION]
 |Runs tests for the stem library.
 |
-|  -a, --all runs unit, integ, and style checks (same as '-uis')
+|  -a, --all runs unit, integ, and style checks (same as '-ui')
 |  -u, --unitruns unit tests
 |  -i, --integ   runs integration tests
 |  -t, --target TARGET   comma separated list of extra targets for integ tests

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/gettor] Update translations for gettor

2015-04-24 Thread translation

commit b05f6c1ee77a2764b8f32c7b2dde8008e1783030
Author: Translation commit bot translat...@torproject.org
Date:   Fri Apr 24 19:15:05 2015 +

Update translations for gettor
---
 es_MX/gettor.po |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/es_MX/gettor.po b/es_MX/gettor.po
index 75fc6f9..a524f74 100644
--- a/es_MX/gettor.po
+++ b/es_MX/gettor.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2015-04-24 13:03+\n
+PO-Revision-Date: 2015-04-24 18:52+\n
 Last-Translator: Ciclovia Stiltskin bluesh...@yahoo.com\n
 Language-Team: Spanish (Mexico) 
(http://www.transifex.com/projects/p/torproject/language/es_MX/)\n
 MIME-Version: 1.0\n
@@ -137,7 +137,7 @@ msgid 
 If your bandwith is low or your provider doesn't allow you to\n
 receive large attachments in your email, GetTor can send you several\n
 small packages instead of one big one.
-msgstr Si su banda ancha es baja o si su proveedor no le permite\n recibir 
archivos adjuntos de gran tamaÃ±o en su correo electÃ³nico, GetTor puede 
enviarle paquetes pequeÃ±os en vez de uno grande. 
+msgstr Si su banda ancha es de baja velocidad o si su proveedor no le 
permite\n recibir archivos adjuntos de gran tamaÃ±o en su correo electÃ³nico, 
GetTor puede enviarlo en paquetes pequeÃ±os en vez de uno grande. 
 
 #: lib/gettor/i18n.py:101
 msgid 
@@ -152,7 +152,7 @@ msgstr Simplemente incluya la palabra \split\ de manera 
aislada en un nuevo r
 msgid 
 Sending this text in an email to GetTor will cause it to send you \n
 the Tor Browser Bundle in a number of 1,4MB attachments.
-msgstr Mandar este texto por correo electrÃ³nico a GetTor producirÃ¡ que se 
le envÃe el Paquete Tor Browser en una cantidad de adjuntos de 1,4MB
+msgstr Al mandar este texto por correo electrÃ³nico a GetTor producirÃ¡ que 
se le envÃe Tor Browser Bundle en varios archivos adjuntos  de 1,4MB. 
 
 #: lib/gettor/i18n.py:110
 msgid 
@@ -169,31 +169,31 @@ msgid 
 2.) Unzip all files ending in \.z\. If you saved all attachments to\n
 a fresh folder before, simply unzip all files in that folder. If you don't\n
 know how to unzip the .z files, please see the UNPACKING THE FILES section.
-msgstr 
+msgstr 2.) Descomprima los archivos que terminen en\.z\. Si usted ha 
guardado los archivos adjuntos en\n una carpeta nueva, simplemente descomprima 
todos los archivos en dicha carpeta. Si usted \nno\nsabe como descomprimir los 
archivos .z, por favor refierase a la secciÃ³n DESCOMPRESIÃN DE ARCHIVOS 
 
 #: lib/gettor/i18n.py:119
 msgid 
 3.) Verify all files as described in the mail you received with \n
 each package. (gpg --verify)
-msgstr 
+msgstr 3.) Verifique todos los archivos como ha sido descrito en el correo 
que recibiÃ³ con\ncada paquete. (gpg --verify) 
 
 #: lib/gettor/i18n.py:122
 msgid 
 4.) Now unpack the multi-volume archive into one file by double-\n
 clicking the file ending in \..split.part01.exe\. This should start the \n
 process automatically.
-msgstr 
+msgstr 4.) Ahora descargue el archivo multi-volume en un solo fichero 
haciendo doble\nclick en el archivo con terminaciÃ³n \..split.part01.exe\. 
Esto debe iniciar el\nproceso automaticamente.
 
 #: lib/gettor/i18n.py:126
 msgid 
 5.) After unpacking is finished, you should find a newly created \n
 \.exe\ file in your destination folder. Simply doubleclick\n
 that and Tor Browser Bundle should start within a few seconds.
-msgstr 
+msgstr 5.) DespuÃ©s de que la descarga ha finalizado, usted deberÃa 
encontrar un nuevo archivo\n\.exe\ en su carpeta de destino. Simplemente 
realice doble click en el\ny Tor Browser Bundle debe iniciar en unos segundos.
 
 #: lib/gettor/i18n.py:130
 msgid 6.) That's it. You're done. Thanks for using Tor and have fun!
-msgstr 
+msgstr 6.) Listo. Usted ha concluido. Gracias por usar Tor y Â¡diviÃ©rtase!
 
 #: lib/gettor/i18n.py:132
 msgid 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug 12827: Create preference to disable SVG.

2015-04-24 Thread mikeperry

commit 3006aa548cefa2f9d0968c978786dcefa9309119
Author: Kathy Brade br...@pearlcrescent.com
Date:   Fri Apr 24 10:40:44 2015 -0400

fixup! Bug 12827: Create preference to disable SVG.

During parsing, avoid dereferencing null pointers when script and
style elements are created as generic elements (i.e., when
svg.in-content.enabled=false). Fixes ticket #15794.
---
 parser/html/nsHtml5TreeOperation.cpp |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/parser/html/nsHtml5TreeOperation.cpp 
b/parser/html/nsHtml5TreeOperation.cpp
index 7ad65247..b9f1768 100644
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -607,8 +607,8 @@ void
 nsHtml5TreeOperation::PreventScriptExecution(nsIContent* aNode)
 {
   nsCOMPtrnsIScriptElement sele = do_QueryInterface(aNode);
-  MOZ_ASSERT(sele);
-  sele-PreventExecution();
+  if (sele)
+sele-PreventExecution();
 }
 
 void
@@ -827,14 +827,18 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* 
aBuilder,
 case eTreeOpSetStyleLineNumber: {
   nsIContent* node = *(mOne.node);
   nsCOMPtrnsIStyleSheetLinkingElement ssle = do_QueryInterface(node);
-  NS_ASSERTION(ssle, Node didn't QI to style.);
+  if (!ssle)
+return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+
   ssle-SetLineNumber(mFour.integer);
   return NS_OK;
 }
 case eTreeOpSetScriptLineNumberAndFreeze: {
   nsIContent* node = *(mOne.node);
   nsCOMPtrnsIScriptElement sele = do_QueryInterface(node);
-  NS_ASSERTION(sele, Node didn't QI to script.);
+  if (!sele)
+return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+
   sele-SetScriptLineNumber(mFour.integer);
   sele-FreezeUriAsyncDefer();
   return NS_OK;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Revert Add +x to these .in files; see if it helps

2015-04-24 Thread nickm

commit f6167f51ac99305853ded434cccfc3718e6d4d9b
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Apr 24 16:05:41 2015 -0400

Revert Add +x to these .in files; see if it helps

This reverts commit ecf98313d673f010b52f8d29c352cd9b8f145734.

It didn't help.
---
 0 files changed

diff --git a/src/test/test_bt.sh.in b/src/test/test_bt.sh.in
old mode 100755
new mode 100644
diff --git a/src/test/test_ntor.sh.in b/src/test/test_ntor.sh.in
old mode 100755
new mode 100644
diff --git a/src/test/test_zero_length_keys.sh.in 
b/src/test/test_zero_length_keys.sh.in
old mode 100755
new mode 100644

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Mark set-test-permissions as .PHONY; use u+x only

2015-04-24 Thread nickm

commit 63a90f2df4dcd7fff862ca3849f3aa3b1dec7e84
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Apr 24 16:10:34 2015 -0400

Mark set-test-permissions as .PHONY; use u+x only
---
 src/test/include.am |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/include.am b/src/test/include.am
index c693544..570048d 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -16,8 +16,9 @@ TESTS += src/test/test src/test/test-slow 
src/test/test-memwipe \
 
 check-am: set-test-permissions
 
+.PHONY: set-test-permissions
 set-test-permissions:
-   chmod 755 $(TESTSCRIPTS)
+   chmod u+x $(TESTSCRIPTS)
 
 
 noinst_PROGRAMS+= src/test/bench

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Update bridge docu to not recommend port 443 anymore

[tor-commits] [tor-messenger-build/master] Update mingw-w64

[tor-commits] [tor-messenger-build/master] Add patch to fix gecko-dev build with mingw-w64

[tor-commits] [tor/master] Kludge include.am to work with automake 1.12

[tor-commits] [tor-messenger-build/master] mozilla: also use master for Windows builds

[tor-commits] [translation/gettor] Update translations for gettor

[tor-commits] [tor-browser-bundle/master] Update changelog and versions

[tor-commits] [stem/master] Static check citing duplicate 'test'

[tor-commits] [torbutton/master] Update changelog and bump version

[tor-commits] [torbutton/master] Bug 15795: Some security slider prefs do not trigger custom checkbox.

[tor-commits] [webwml/master] Add screenshots for MacOS install instructions (#14838).

[tor-commits] [webwml/master] Add screenshots that show how to run Tor Browser on OS X.

[tor-commits] [webwml/master] Remove statement about Mac bundles needing no installation.

[tor-commits] [stem/master] Installation test used python2 style print statment

[tor-commits] [stem/master] Correct installation test for 64bit platforms

[tor-commits] [translation/bridgedb] Update translations for bridgedb

[tor-commits] [translation/tor_animation] Update translations for tor_animation

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

[tor-commits] [translation/bridgedb] Update translations for bridgedb

[tor-commits] [stem/master] 'run_tests.py --help' still mentioned the '--style' argument

[tor-commits] [translation/gettor] Update translations for gettor

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug 12827: Create preference to disable SVG.

[tor-commits] [tor/master] Revert Add +x to these .in files; see if it helps

[tor-commits] [tor/master] Mark set-test-permissions as .PHONY; use u+x only

25 matches

Site Navigation

Mail list logo

Footer information