- tor-commits - lists.torproject.org

[torbutton/master] Properly use nsIPrefLocalizedString in torbutton_get_general_useragent_locale()
by mikeperry＠torproject.org 02 Oct '11

02 Oct '11

commit 84e8dbc93a59c5d60e472628f1fbfc45713fe569 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Sat Oct 1 18:11:30 2011 +0200 Properly use nsIPrefLocalizedString in torbutton_get_general_useragent_locale() Replace the custom dereferencing of the stringbundle by the proper usage of nsIPrefLocalizedString. --- src/chrome/content/torbutton.js | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8511fc0..a884ba2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1238,15 +1238,8 @@ function torbutton_set_timezone(mode, startup) { function torbutton_get_general_useragent_locale() { try { - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); - if (locale != "chrome://global/locale/intl.properties") { - return locale; - } - - var bundle = Components.classes["@mozilla.org/intl/stringbundle;1"] - .getService(Components.interfaces.nsIStringBundleService); - var stringbundle = bundle.createBundle(locale); - return stringbundle.GetStringFromName("general.useragent.locale"); + return m_tb_prefs.getComplexValue("general.useragent.locale", + Components.interfaces.nsIPrefLocalizedString).data; } catch(err) { torbutton_log(4, "Error while getting general.useragent.locale:" + err); return 'en-US';

1 0

[torbutton/master] Bug #3686: Fix loading of localized system homepage
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 90cbb9f0a744d5070c5ddfef7672714b72e085c7 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Sat Oct 1 17:55:28 2011 +0200 Bug #3686: Fix loading of localized system homepage On Debian and Tails, default homepage is more than just a string preference as it is internationalized using nsIPrefLocalizedString. --- src/chrome/content/torbutton.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3f9a64d..8511fc0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2831,6 +2831,12 @@ function torbutton_tag_new_browser(browser, tor_tag, no_plugins) { } } +function torbutton_reload_homepage() { + var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", + Components.interfaces.nsIPrefLocalizedString).data; + gBrowser.loadURI(homepage, null, null); +} + function torbutton_set_launch_state(state, session_restore) { if (!m_tb_wasinited) torbutton_init(); var no_plugins = m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins"); @@ -2906,8 +2912,7 @@ function torbutton_set_launch_state(state, session_restore) { } } } - var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); - gBrowser.loadURI(homepage, null, null); + torbutton_reload_homepage(); } } else { torbutton_log(3, "Leaving tor disabled"); @@ -2920,8 +2925,7 @@ function torbutton_set_launch_state(state, session_restore) { // Load our homepage again. We just killed it via the toggle. if (!session_restore) { - var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); - gBrowser.loadURI(homepage, null, null); + torbutton_reload_homepage(); } } }

1 0

r25145: {website} patch some oddities for windows users on download-easy. (in website/trunk: css download/en)
by Andrew Lewman 01 Oct '11

01 Oct '11

Author: phobos Date: 2011-10-01 15:43:17 +0000 (Sat, 01 Oct 2011) New Revision: 25145 Modified: website/trunk/css/ie7-and-down.css website/trunk/css/layout.css website/trunk/download/en/download-easy.wml Log: patch some oddities for windows users on download-easy. Modified: website/trunk/css/ie7-and-down.css =================================================================== --- website/trunk/css/ie7-and-down.css 2011-10-01 00:05:29 UTC (rev 25144) +++ website/trunk/css/ie7-and-down.css 2011-10-01 15:43:17 UTC (rev 25145) @@ -83,7 +83,7 @@ } .dbox.dl { - margin: 0px 0px 20px 20px; + margin: 0px 0px 20px 0px; } .dbox.dsmall { @@ -101,6 +101,10 @@ table h2 { margin-bottom: -4px; padding-bottom: 0;} +.desc { + width: 420px; + } + /*#footer .signup { width: 82px; font-size: 0; Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-10-01 00:05:29 UTC (rev 25144) +++ website/trunk/css/layout.css 2011-10-01 15:43:17 UTC (rev 25145) @@ -641,9 +641,9 @@ .easy { width: 710px; - height: 241px; background: url(../images/easy-bg.png) repeat-x scroll left 85px; margin-bottom: 10px; + padding-bottom: 15px; } .easy .package h2, @@ -654,7 +654,7 @@ } .easy .package h2 { - font-size: 30px; + font-size: 28px; font-weight: normal; padding-top: 10px; padding-bottom: 5px; @@ -711,8 +711,9 @@ .easy.linux, .easy.mac { border: 1px solid #885CA4; - border-radius: 10px; - } + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; } .open { display: block; @@ -1082,7 +1083,7 @@ } .dbox.dl input.amount { - width: 120px; + width: 110px; } .dbox.donate { Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-10-01 00:05:29 UTC (rev 25144) +++ website/trunk/download/en/download-easy.wml 2011-10-01 15:43:17 UTC (rev 25145) @@ -44,9 +44,11 @@ (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <h2>Tor Browser Bundle for Windows</h2> - <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <div class="desc"> + <h2>Tor Browser Bundle for Windows</h2> + <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> </div> </div> @@ -63,9 +65,11 @@ (<a class="mac-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <h2>Tor Browser Bundle for Mac</h2> - <em>Version <version-torbrowserbundleosx> - OS X</em> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <div class="desc"> + <h2>Tor Browser Bundle for Mac</h2> + <em>Version <version-torbrowserbundleosx> - OS X</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> <p class="alt-dl">Not Using Mac? Download for <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> </div> </div> @@ -82,9 +86,11 @@ (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <h2>Tor Browser Bundle for Linux</h2> - <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <div class="desc"> + <h2>Tor Browser Bundle for Linux</h2> + <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + </div> <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> </div> </div>

1 0

[torbutton/master] Bug #4016: Resize window on "New Identity"
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit b5e0eda6d90883dd00c476dc1a63f32e8b6214e3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 30 20:58:16 2011 -0700 Bug #4016: Resize window on "New Identity" --- src/chrome/content/torbutton.js | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d7ef88..3f9a64d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1529,6 +1529,9 @@ function torbutton_new_identity() { } } + // gBrowser should always be here. + torbutton_set_window_size(gBrowser.contentWindow); + torbutton_log(3, "New identity successful"); } @@ -3191,6 +3194,8 @@ function torbutton_regen_google_cookie() { if (!m_tb_hidden_browser) { torbutton_init_hidden_browser(); } + // XXX: This is might be forbidden according to + // https://bugzilla.mozilla.org/show_bug.cgi?id=608628 m_tb_hidden_browser.addProgressListener(torbutton_google_cookie_regen_listener, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);

1 0

[bridgedb/master] 4056-cleanDatabase has wrong function name
by arma＠torproject.org 01 Oct '11

01 Oct '11

commit fc8ec9789cd8d38d80448877f689ecf086cddf9f Author: aagbsn <aagbsn(a)extc.org> Date: Mon Sep 19 16:10:06 2011 -0700 4056-cleanDatabase has wrong function name Call the correct function name. cleanWarnedBridges() renamed to cleanWarnedEmails() --- lib/bridgedb/Dist.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 030c7fa..bbff9f1 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -296,7 +296,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): db = bridgedb.Storage.getDB() try: db.cleanEmailedBridges(time.time()-MAX_EMAIL_RATE) - db.cleanWarnedBridges(time.time()-MAX_EMAIL_RATE) + db.cleanWarnedEmails(time.time()-MAX_EMAIL_RATE) except: db.rollback() raise

1 0

[bridgedb/master] 4056-add smart defaults for recaptcha settings
by arma＠torproject.org 01 Oct '11

01 Oct '11

commit e892917afee9e419daa7cf02a8c265a5fb809b39 Author: aagbsn <aagbsn(a)extc.org> Date: Mon Sep 19 16:12:11 2011 -0700 4056-add smart defaults for recaptcha settings If RECAPTCHA_* configuration options are not present in bridgedb.conf, bridgedb disables recaptcha support. --- lib/bridgedb/Main.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 3e06936..55f2956 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -37,6 +37,9 @@ class Conf: CONFIG_DEFAULTS = { 'HTTPS_INCLUDE_FINGERPRINTS' : False, 'EMAIL_INCLUDE_FINGERPRINTS' : False, + 'RECAPTCHA_ENABLED' : False, + 'RECAPTCHA_PUB_KEY' : "", + 'RECAPTCHA_PRIV_KEY' : "" } # An example configuration. Used for testing. See sample

1 0

[torflow/master] Submodule...
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 87ac7f972a4dc603046538b6ada6456e64057a65 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 30 17:23:48 2011 -0700 Submodule... --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index e99394c..520722b 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit e99394c46b30ed73ffbf02d5c6a39bf9b04416a2 +Subproject commit 520722b8e3a7bb72bf9b5063f3c1649b53110225

1 0

[pytorctl/master] 4024 - get_git_version does not work for submodule
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 520722b8e3a7bb72bf9b5063f3c1649b53110225 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 14 16:56:16 2011 -0700 4024 - get_git_version does not work for submodule Added support for detached heads --- TorUtil.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index 73ea2a8..fee4407 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -429,9 +429,13 @@ def get_git_version(path_to_repo): plog('NOTICE', 'Git Repo at %s Not Found' % path_to_repo) return ('unknown','unknown') try: - f = open(path_to_repo+ref[1]) - branch = ref[1].strip().split('/')[-1] - head = f.readline().strip() + if len(ref) > 1: + f = open(path_to_repo+ref[1]) + branch = ref[1].strip().split('/')[-1] + head = f.readline().strip() + else: + branch = 'detached' + head = ref[0] f.close() return (branch, head) except IOError, e:

1 0

[torflow/master] 4077 remove UseMicrodescriptors from torrc
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 599a74baf7886ae6008583059de6f9018f5d2cfc Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 21 14:06:55 2011 -0700 4077 remove UseMicrodescriptors from torrc "Tor 0.2.3.4-alpha makes 'FetchUselessDescriptors' cause all descriptor types and all consensus types (including microdescriptors) to get fetched. Fixes bug 3851; bugfix on 0.2.3.1-alpha." --- NetworkScanners/BwAuthority/data/tor/torrc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/data/tor/torrc b/NetworkScanners/BwAuthority/data/tor/torrc index 2f15c38..53c0a63 100644 --- a/NetworkScanners/BwAuthority/data/tor/torrc +++ b/NetworkScanners/BwAuthority/data/tor/torrc @@ -8,6 +8,5 @@ PidFile ./data/tor/tor.pid CookieAuthentication 1 FetchUselessDescriptors 1 __LeaveStreamsUnattached 1 -UseMicrodescriptors 0 FetchDirInfoExtraEarly 1 FetchDirInfoEarly 1

1 0

[torflow/master] Suggest add_torctl.sh if torctl is missing.
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 3558511832cb68f8b8cf1202a2879785e045a866 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 30 17:19:40 2011 -0700 Suggest add_torctl.sh if torctl is missing. --- NetworkScanners/ExitAuthority/libsoat.py | 2 +- NetworkScanners/ExitAuthority/snakeinspector.py | 2 +- NetworkScanners/ExitAuthority/soat.py | 2 +- NetworkScanners/ExitAuthority/soat_config.py | 2 +- NetworkScanners/ExitAuthority/soatstats.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NetworkScanners/ExitAuthority/libsoat.py b/NetworkScanners/ExitAuthority/libsoat.py index 153d80f..8a62383 100644 --- a/NetworkScanners/ExitAuthority/libsoat.py +++ b/NetworkScanners/ExitAuthority/libsoat.py @@ -28,7 +28,7 @@ try: from TorCtl.TorUtil import * except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py index 45250b6..f34826e 100755 --- a/NetworkScanners/ExitAuthority/snakeinspector.py +++ b/NetworkScanners/ExitAuthority/snakeinspector.py @@ -26,7 +26,7 @@ try: import TorCtl.TorUtil except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index 2355dea..bafe43f 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -83,7 +83,7 @@ try: from TorCtl.TorUtil import plog except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/soat_config.py b/NetworkScanners/ExitAuthority/soat_config.py index fa36658..f7a1fc8 100644 --- a/NetworkScanners/ExitAuthority/soat_config.py +++ b/NetworkScanners/ExitAuthority/soat_config.py @@ -12,7 +12,7 @@ try: from TorCtl.PathSupport import * except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/soatstats.py b/NetworkScanners/ExitAuthority/soatstats.py index ab790e5..a4b42cb 100755 --- a/NetworkScanners/ExitAuthority/soatstats.py +++ b/NetworkScanners/ExitAuthority/soatstats.py @@ -20,7 +20,7 @@ try: from TorCtl.TorUtil import * except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit()

1 0