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

[tor-launcher/master] Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit c1ee486489e33bb07164448b096afba5d899f661 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 12 17:39:45 2015 -0500 Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set. If the TOR_HIDE_BROWSER_LOGO environment variable is set, hide Tor Browser logo within the network settings wizard. Based on contributions from linostar and proper. --- src/chrome/content/network-settings-wizard.xul | 12 ++++++------ src/chrome/content/network-settings.js | 9 ++++++++- src/chrome/skin/network-settings.css | 7 ++++++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 04251f9..33ba6c5 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -35,7 +35,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator orient="vertical" /> + <separator class="tbb-logo-separator" orient="vertical" /> <groupbox flex="1"> <description>&torsettings.prompt;</description> </groupbox> @@ -60,7 +60,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.proxyQuestion;</label> @@ -79,7 +79,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <label class="instructions">&torSettings.enterProxy;</label> <groupbox id="proxySpecificSettings" /> </wizardpage> @@ -89,7 +89,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.bridgeQuestion;</label> @@ -109,7 +109,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <vbox> <label id="bridgeSettingsPrompt" class="question">&torSettings.bridgeSettingsPrompt;</label> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 908e711..f100f90 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -120,6 +120,13 @@ function initDialog() var haveWizard = (wizardElem != null); if (haveWizard) { + // Hide the Tor Browser logo and associated separator element if the + // TOR_HIDE_BROWSER_LOGO environment variable is set. + let env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists("TOR_HIDE_BROWSER_LOGO")) + wizardElem.setAttribute("tor_hide_browser_logo", true); + // Set "Copy Tor Log" label and move it after the Quit (cancel) button. var copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index e4142d4..331ae42 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, The Tor Project, Inc. + * Copyright (c) 2015, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -94,6 +94,11 @@ button.firstAnswer { margin-right: 20px; } +wizard[tor_hide_browser_logo="true"] .tbb-logo, +wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { + display: none; +} + #bridgeCustomEntry { margin-left: 30px; }

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 13 Jan '15

13 Jan '15

commit d72bfafcc35fd4c79d4c9eba899c60e217d82623 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 13 09:15:46 2015 +0000 Update translations for torbutton-torbuttondtd --- cs/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd index 9beff59..0067940 100644 --- a/cs/torbutton.dtd +++ b/cs/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klikněte pro inicializaci Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Ochrana osobních údajů a nastavení zabezpečení"> <!ENTITY torbutton.prefs.block_thread "Blokovat čtení historie při používání Tor (kritické)"> <!ENTITY torbutton.prefs.block_thwrite "Blokovat zápis do historie při používání Tor (doporučeno)"> <!ENTITY torbutton.prefs.block_nthread "Blokovat čtení historie během Non-Tor (volitelné)"> @@ -151,7 +151,7 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Úroveň zabezpečení"> <!ENTITY torbutton.prefs.sec_low "Nízká (výchozí)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_med_low "Středně - nízká"> +<!ENTITY torbutton.prefs.sec_med_high "Středně - vysoká"> <!ENTITY torbutton.prefs.sec_high "Vysoká"> <!ENTITY torbutton.prefs.sec_custom "Vlastní hodnoty">

1 0

[torbutton/master] Bug 14100: Add option to hide NetworkSettings
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 765fee607af6fa88b99476dee10298e5db3b9eb1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 09:36:35 2015 +0000 Bug 14100: Add option to hide NetworkSettings This patch hides the NetworkSettings menuitem if the environment variable TOR_NO_DISPLAY_NETWORK_SETTINGS is set. Thanks to linostar for writing it. --- src/chrome/content/torbutton.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bf06e04..4715fb6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2386,6 +2386,16 @@ function torbutton_close_on_toggle(mode, newnym) { // New Identity where it is not supported (ie no control port). function torbutton_check_protections() { + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + + // Bug 14100: check for the existence of an environment variable + // in order to toggle the visibility of networksettings menuitem + if (env.exists("TOR_NO_DISPLAY_NETWORK_SETTINGS")) + document.getElementById("torbutton-networksettings").hidden = true; + else + document.getElementById("torbutton-networksettings").hidden = false; + var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref;

1 0

[torbutton/master] Bug #13078: environment variable to skip TorButton control port verification
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 38a59e819604de5018db5db54fb08fd9e1581d1f Author: Patrick Schleizer <adrelanos(a)riseup.net> Date: Sun Sep 7 20:49:41 2014 +0000 Bug #13078: environment variable to skip TorButton control port verification --- src/chrome/content/torbutton.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5aed682..bf06e04 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1875,8 +1875,12 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. + const kEnvSkipControlPortTest = "TOR_SKIP_CONTROLPORTTEST"; + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); if (m_tb_control_port && !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful;

1 0

[tor/master] Fix a conversion warning on 32-bit clang
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 732c885b32477513b6ef374620dec32c54eb2d9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 12 22:33:10 2015 -0500 Fix a conversion warning on 32-bit clang --- src/or/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/relay.c b/src/or/relay.c index f878c9d..725a14b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2457,7 +2457,7 @@ cell_queues_check_size(void) */ if (rend_cache_total > get_options()->MaxMemInQueues / 5) { const size_t bytes_to_remove = - rend_cache_total - (get_options()->MaxMemInQueues / 10); + rend_cache_total - (size_t)(get_options()->MaxMemInQueues / 10); rend_cache_clean_v2_descs_as_dir(time(NULL), bytes_to_remove); alloc -= rend_cache_total; alloc += rend_cache_get_total_allocation();

1 0

[tor/master] On jessie, we need a =, not a ==
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit a0b4c2f1bd0c5761fd82bdeb7ccfe00f9085d7ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 12 22:30:40 2015 -0500 On jessie, we need a =, not a == --- src/test/zero_length_keys.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index eea1f35..3a99ca1 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -68,7 +68,7 @@ if [ "$1" != "-e" ]; then fi # create empty files for -z -if [ "$1" == "-z" ]; then +if [ "$1" = "-z" ]; then FILE_DESC="regenerates zero-length" touch "$DATA_DIR"/keys/secret_id_key || exit -1 touch "$DATA_DIR"/keys/secret_onion_key || exit -1

1 0

[tor/master] mktemp wants some Xs
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 7257f2e31dcf07a8eeb4e9db6a2065d8e106ce0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 12 21:45:41 2015 -0500 mktemp wants some Xs --- src/test/zero_length_keys.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index 8e003a4..eea1f35 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -25,7 +25,7 @@ if [ $# -lt 1 ]; then exit $? fi -export DATA_DIR=`mktemp -d -t tor_zero_length_keys` +export DATA_DIR=`mktemp -d -t tor_zero_length_keys.XXXXXX` # DisableNetwork means that the ORPort won't actually be opened. # 'ExitRelay 0' suppresses a warning. TOR="./src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0"

1 0

[tor/master] Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds work
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 038804e13dbed8160e41e57116aa81e240f3e47a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 12 21:28:01 2015 -0500 Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds work --- src/test/include.am | 2 +- src/test/zero_length_keys.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index 71425ea..b9b381f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -122,7 +122,7 @@ if USEPYTHON ./src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py ./src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py endif - ./src/test/zero_length_keys.sh + $(top_srcdir)/src/test/zero_length_keys.sh EXTRA_DIST += \ src/test/bt_test.py \ diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index e7cb900..8e003a4 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -26,7 +26,9 @@ if [ $# -lt 1 ]; then fi export DATA_DIR=`mktemp -d -t tor_zero_length_keys` -TOR="src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345" +# DisableNetwork means that the ORPort won't actually be opened. +# 'ExitRelay 0' suppresses a warning. +TOR="./src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0" if [ -s "$DATA_DIR"/keys/secret_id_key -a -s "$DATA_DIR"/keys/secret_onion_key -a -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then echo "Failure: Previous tor keys present in tor data directory"

1 0

[webwml/master] add two new mirrors
by andrew＠torproject.org 12 Jan '15

12 Jan '15

commit 66fdc277ca999fbbfa7527f0fbdf40d7564b5fcf Author: Andrew Lewman <andrew(a)torproject.is> Date: Mon Jan 12 17:08:30 2015 -0500 add two new mirrors --- include/tor-mirrors.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index 2bc2c58..5d87dec 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -104,3 +104,5 @@ hostmaster(a)vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No, h mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, , , http://mirror.ntzk.de/torproject.org/dist/, https://mirror.ntzk.de/torproject.org/dist/, , , Wed Jan 7 18:27:42 2015 mirror(a)xfree.com.ar, Xfree.com.ar, AR, Argentina, South America, TRUE, FALSE, No, http://tor.xfree.com.ar/, , , , http://tor.xfree.com.ar/dist/, , , , Thu Jan 8 02:14:18 2015 tor AT eprci NET, EPRCI, US, NH, US, TRUE, FALSE, No, http://tor.eprci.net/, https:/www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Wed Jan 7 18:27:42 2015 +contact(a)mrtino.eu, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mrtino.eu,,,, http://tor.mrtino.eu/dist,,,, +tor(a)kura.io,KURA IO LIMITED,NL,Netherlands,Europe,TRUE,TRUE,TRUE,http://tor-mirror.kura.io/,htt…,,

1 0

[tor/master] Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty
by nickm＠torproject.org 12 Jan '15

12 Jan '15

1 0