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

[tor-browser/tor-browser-24.3.0esr-1] Space out a template declaration.
by mikeperry＠torproject.org 06 Feb '14

06 Feb '14

commit e1e5cedea9b617d790a08ce30a1eba03cec01bd1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 5 22:41:03 2014 -0800 Space out a template declaration. Our gcc version requires spacing for nested templates. --- image/src/imgStatusTracker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/imgStatusTracker.h b/image/src/imgStatusTracker.h index d3f36b3..3ac26f0 100644 --- a/image/src/imgStatusTracker.h +++ b/image/src/imgStatusTracker.h @@ -212,7 +212,7 @@ public: nsIntRect GetInvalidRect() const { return mInvalidRect; } - typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy>> ProxyArray; + typedef nsTObserverArray< mozilla::WeakPtr<imgRequestProxy> > ProxyArray; private: friend class imgStatusNotifyRunnable; friend class imgRequestNotifyRunnable;

1 0

[bridgedb/develop] Improve WebResourceBridges' docstring
by isis＠torproject.org 06 Feb '14

06 Feb '14

commit 46ff7aaf130353abf4d30a2562bce3692ec93f55 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Feb 3 08:23:29 2014 +0000 Improve WebResourceBridges' docstring --- lib/bridgedb/HTTPServer.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 610249a..633d903 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -244,9 +244,23 @@ class WebResourceBridges(twisted.web.resource.Resource): def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, includeFingerprints=True, domains=None): """Create a new WebResource. - distributor -- an IPBasedDistributor object - schedule -- an IntervalSchedule object - N -- the number of bridges to hand out per query. + :type distributor: :class:`IPBasedDistributor` + :param distributor: The mechanism to retrieve bridges for + this distributor + :type schedule: :class:`IntervalSchedule` + :param schedule: The time period used to tweak the bridge + selection procedure. + :param int N: The number of bridges to hand out per query. + :param bool useForwardedHeader: Whether or not we should + use the the + X-Forwarded-For header + instead of the source IP + address. + :param bool includeFingerprints: Do we include the + bridge's fingerprint + in the response? + :param list domains: The list of email provider + domain names we support. (unused) """ gettext.install("bridgedb", unicode=True) twisted.web.resource.Resource.__init__(self)

1 0

[bridgedb/develop] Provide an Advanced Options page for easier bridge selection
by isis＠torproject.org 06 Feb '14

06 Feb '14

commit 59e8b4684a99537bf7f4def43ede7d6c4dc33eb3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Feb 3 02:37:48 2014 +0000 Provide an Advanced Options page for easier bridge selection The options page allows the user to select a specific pluggable transport type and if they require IPv6 addresses. All pages inheriting from the base template will provide navigation buttons. --- lib/bridgedb/HTTPServer.py | 35 +++++++++++++++++++++++++++++-- lib/bridgedb/templates/base.html | 5 +++++ lib/bridgedb/templates/index.html | 11 ++++------ lib/bridgedb/templates/options.html | 39 +++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index ad69e1b..610249a 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -208,7 +208,35 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): return redirectTo(request.uri, request) -class WebResource(twisted.web.resource.Resource): +class WebResourceOptions(twisted.web.resource.Resource): + """This resource is used by Twisted Web to give a web page with + additional options that the user may use to specify the criteria + the returned bridges should meet. + """ + isLeaf = True + + def __init__(self): + """Create a new WebResource for the Options page""" + gettext.install("bridgedb", unicode=True) + twisted.web.resource.Resource.__init__(self) + + def render_GET(self, request): + rtl = False + + try: + rtl = usingRTLLang(request) + except Exception as err: + logging.exception(err) + logging.error("The gettext files were not properly installed.") + logging.info("To install translations, try doing `python " \ + "setup.py compile_catalog`.") + + request.setHeader("Content-Type", "text/html; charset=utf-8") + return lookup.get_template('options.html').render(rtl=rtl) + + render_POST = render_GET + +class WebResourceBridges(twisted.web.resource.Resource): """This resource is used by Twisted Web to give a web page with some bridges in response to a request.""" isLeaf = True @@ -433,11 +461,14 @@ def addWebServer(cfg, dist, sched): httpdist.putChild('assets', static.File(os.path.join(template_root, 'assets/'))) - resource = WebResource(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, + resource = WebResourceBridges(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS, domains=cfg.EMAIL_DOMAINS) + resource_options = WebResourceOptions() + + httpdist.putChild('options', resource_options) if cfg.RECAPTCHA_ENABLED: protected = CaptchaProtectedResource( recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 9f8a70a..441f3b6 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -71,6 +71,11 @@ ${self.body()} ${_("Get IPv6 bridges")} </button> </a> + <a href="./options"> + <button class="btn btn-default" type="button"> + ${_("Advanced Options")} + </button> + </a> </div> </div> </div> diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 82522c8..a97e21d 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -14,13 +14,10 @@ </div> <div class="step row"> - <div class="bdb_span7 step-text"> - <span class="lead"> - <span class="step-title"> - ${_("Step 2")} </span> - <span style="margin-left: 20px;"> - ${_("Get %s bridges %s") % ("""<a href="/bridges">""", "</a>")}</span> - </span></div> + <div class="span1"> + <p class="lead"><span class="step-title"> ${_("Step 2")} </span></p></div> + <div class="span5 step-text"> + ${_("Get %s bridges %s") % ("""<a href="/options">""", "</a>")}</div> </div> <div class="step row"> diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html new file mode 100644 index 0000000..82d1213 --- /dev/null +++ b/lib/bridgedb/templates/options.html @@ -0,0 +1,39 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.html"/> + +<br /> +<br /> +<p><h2><a href="bridges">${_("""Just Give Me Bridges!""")}</a></h2> +</p> +<br /><br /><br /> +<hr /> +<p> +<h3> ${_("""Advanced Options""")}</h3> +<form action="bridges" method="GET"> +<div style="float: left;"> +<p>${_("""Do you need IPv6 addresses?""")} +</p> +## TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses" +<input type="checkbox" name="ipv6" value="yes">${_("""Yes!""")}</input> +<br /> +<br /> +</div><div style="float: right;"> +<p>${_("""Do you need a specific pluggable transport?""")}</p> +<select name="transport"> +<option name="none" value="0"> +## TRANSLATORS: Please do not translate the pluggable transport names +## (obfs2, obfs3, etc) + ${_("""No""")} +</option> +<option value="obfs2">${_("""Yes, obfs2""")}</option> +<option value="obfs3">${_("""Yes, obfs3""")}</option> + +</select> +</div> +<br /> +<br /> +<br /> +<br /> +<p><button>${_("""Get Bridges""")}</button></p> +</form> +<hr>

1 0

[bridgedb/develop] Merge branch 'testing/tpo-sysrqb/bug9127' into develop
by isis＠torproject.org 06 Feb '14

06 Feb '14

commit aa835c1d9155c5139950a4e35d76bf6cfb295415 Merge: a2aec59 46ff7aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 6 05:41:56 2014 +0000 Merge branch 'testing/tpo-sysrqb/bug9127' into develop lib/bridgedb/HTTPServer.py | 55 +++++++++++++++++++++++++++++++---- lib/bridgedb/templates/base.html | 5 ++++ lib/bridgedb/templates/index.html | 11 +++---- lib/bridgedb/templates/options.html | 39 +++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 12 deletions(-)

1 0

r26590: {website} add the trademark registrations to the faq. (website/trunk/docs/en)
by Andrew Lewman 06 Feb '14

06 Feb '14

Author: phobos Date: 2014-02-06 04:51:50 +0000 (Thu, 06 Feb 2014) New Revision: 26590 Modified: website/trunk/docs/en/trademark-faq.wml Log: add the trademark registrations to the faq. Modified: website/trunk/docs/en/trademark-faq.wml =================================================================== --- website/trunk/docs/en/trademark-faq.wml 2014-02-05 17:01:31 UTC (rev 26589) +++ website/trunk/docs/en/trademark-faq.wml 2014-02-06 04:51:50 UTC (rev 26590) @@ -99,6 +99,13 @@ help us strengthen its anonymity protection further. We distribute the software itself freely, but require correct attribution. </p> + <p>We hold two trademarks in the United States: + <ul> + <li>Tor Onion Logo, U.S. Trademark Registration No. 3,465,433</li> + <li>Tor, U.S. Registration No. 3,465,432.</li> + </ul> + </p> + <a id="commercial"></a> <h2>What if I produce non-open source, commercial products based on Tor?</h2>

1 0

[tor-browser-bundle/master] The downloads link for sourceforge is flaky.
by mikeperry＠torproject.org 06 Feb '14

06 Feb '14

commit ce793d89e62af10fdc2ba2a0e85890b4cfc4d6f6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 5 18:51:46 2014 -0800 The downloads link for sourceforge is flaky. Hardcode a specific mirror. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 2b4b8c1..a5004e1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -80,5 +80,5 @@ ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… -PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 85815f5..e7eca34 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -80,5 +80,5 @@ ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… -PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… diff --git a/gitian/versions.beta b/gitian/versions.beta index 1254d56..4aad168 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -81,5 +81,5 @@ ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… -PY2EXE_URL=http://downloads.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP…

1 0

[tor-browser-bundle/master] Need to mention Firefox 24.3.0 in the ChangeLog.
by mikeperry＠torproject.org 06 Feb '14

06 Feb '14

commit 139c166011df6e33d9f95a82f37a421d950dee8c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 5 18:43:22 2014 -0800 Need to mention Firefox 24.3.0 in the ChangeLog. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b1f8cd4..2a8c15d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,5 +1,6 @@ Tor Browser Bundle 3.5.2 -- Feb 8 2014 * All Platforms + * Rebase Tor Browser to Firefox 24.3.0ESR * Bug 10419: Block content window connections to localhost * Update Torbutton to 1.6.0 * Bug 10800: Prevent findbox exception and popup in New Identity

1 0

[tor-browser-bundle/master] Update ChangeLog for TBB 3.5.2.
by mikeperry＠torproject.org 06 Feb '14

06 Feb '14

commit ca05548014e5b1dca4c9231c4d641fe2766f389c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 5 17:40:47 2014 -0800 Update ChangeLog for TBB 3.5.2. --- Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3de7813..b1f8cd4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser Bundle 3.5.2 -- Feb 8 2014 + * All Platforms + * Bug 10419: Block content window connections to localhost + * Update Torbutton to 1.6.0 + * Bug 10800: Prevent findbox exception and popup in New Identity + * Bug 10640: Fix about:tor's update pointer position for RTL languages. + * Bug 10095: Fix some cases where resolution is not a multiple of 200x100 + * Bug 10285: Clear site permissions on New Identity + * Bug 9738: Fix for auto-maximizing on browser start + * Bug 10682: Workaround to really disable updates for Torbutton + * Bug 10419: Don't allow connections to localhost if Torbutton is toggled + * Bug 10140: Move Japanese to extra locales (not part of TBB dist) + * Bug 10687: Add Basque (eu) to extra locales (not part of TBB dist) + * Update Tor Launcher to 0.2.4.4 + * Bug 10682: Workaround to really disable updates for Tor Launcher + * Update NoScript to 2.6.8.13 + Tor Browser Bundle 3.5.1 -- Jan 22 2014 * All Platforms * Bug 10447: Remove SocksListenAddress to allow multiple socks ports.

1 0

[tor-browser-bundle/master] Bump versions for TBB 3.5.2.
by mikeperry＠torproject.org 06 Feb '14

06 Feb '14

commit 253b7fa2998d4fcacfc8fa0b4f9f34886951e7b9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 5 17:28:46 2014 -0800 Bump versions for TBB 3.5.2. --- gitian/versions | 14 +++++++------- gitian/versions.alpha | 12 ++++++------ gitian/versions.beta | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gitian/versions b/gitian/versions index ad40d96..2b4b8c1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -TORBROWSER_VERSION=3.5.1 +TORBROWSER_VERSION=3.5.2 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.2.0esr-3.5.1-build1 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2-build1 TOR_TAG=tor-0.2.4.20 -TORLAUNCHER_TAG=0.2.4.3 -TORBUTTON_TAG=1.6.5.5 +TORLAUNCHER_TAG=0.2.4.4 +TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -19,7 +19,7 @@ FLASHPROXY_TAG=1.4 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f -FIREFOX_LANG_VER=24.2.0esr +FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 @@ -33,7 +33,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.12-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -54,7 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 -NOSCRIPT_HASH=5a1a501dae3f1c6e82d9328ee7dea6d6b12552989199dc2d1b49a0d7001ad779 +NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1b0cf80..85815f5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -3,10 +3,10 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.2.0esr-3.5rc1-build3 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2-build1 TOR_TAG=tor-0.2.5.1-alpha -TORLAUNCHER_TAG=0.2.4.3 -TORBUTTON_TAG=1.6.5.4 +TORLAUNCHER_TAG=0.2.4.4 +TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -19,7 +19,7 @@ FLASHPROXY_TAG=1.4 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f -FIREFOX_LANG_VER=24.2.0esr +FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 @@ -33,7 +33,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.12-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -54,7 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 -NOSCRIPT_HASH=5a1a501dae3f1c6e82d9328ee7dea6d6b12552989199dc2d1b49a0d7001ad779 +NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.beta b/gitian/versions.beta index 50b0bc7..1254d56 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,13 +1,13 @@ -TORBROWSER_VERSION=3.6-beta-1 +TORBROWSER_VERSION=3.6-beta-2 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.2.0esr-3.5.1-build1 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2-build1 TOR_TAG=tor-0.2.4.20 -TORLAUNCHER_TAG=0.2.4.3 -TORBUTTON_TAG=1.6.5.4 +TORLAUNCHER_TAG=0.2.4.4 +TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -20,7 +20,7 @@ FLASHPROXY_TAG=1.4 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f -FIREFOX_LANG_VER=24.2.0esr +FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 @@ -34,7 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.12-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -55,7 +55,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 -NOSCRIPT_HASH=5a1a501dae3f1c6e82d9328ee7dea6d6b12552989199dc2d1b49a0d7001ad779 +NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[bridgedb/master] Fix missing import of logging module in Bucket.py.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 61aa9a9a25db470c7a56061b7c9fb8ba46b7e76e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:03:42 2014 +0000 Fix missing import of logging module in Bucket.py. --- lib/bridgedb/Bucket.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 6b8bf54..0038146 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -23,6 +23,7 @@ even though in the database, there would now by 'name1', 'name2' or 'foobar' instead of 'unallocated'. This is why they are called pseudo-distributors. """ +import logging import time import bridgedb.Storage import bridgedb.Bridges

1 0