- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] put the right OS in the changelogs...
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit b4e560edf5af143643e525b3ffbe659b4ac2d6b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:31:47 2011 +0200 put the right OS in the changelogs... --- changelog.linux-2.2 | 2 +- changelog.win-2.2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 20d8bc5..dfd7fb8 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0 diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bde8ad4..bc070ec 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/maint-2.2] add missing commit for removal of betterprivacy from linux bundles
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit eb7dec6deef77535bcd8c12fffe509c3101b972b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:34:21 2011 +0200 add missing commit for removal of betterprivacy from linux bundles --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0bcefb3..14c691b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -392,7 +392,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torbrowser/maint-2.2] update build targets for better automatic building
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit 6b2c454261728e45a8787e7062b7ad19f2338d48 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:10:20 2011 +0200 update build targets for better automatic building --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8859cd0..0bcefb3 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -124,7 +124,7 @@ copy-firefox: cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source -build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ebd265d..0b07e67 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -113,7 +113,7 @@ copy-firefox: -rm -rf $(FETCH_DIR)/Firefox.app cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e8991a2..28b7d82 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -46,6 +46,9 @@ fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fe fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) +fetch-qt: + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) + fetch-openssl: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)

1 0

[torbrowser/maint-2.2] add some missing makefile bits for linux
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit 3df7a8edcb81b222f3fff6303a10865f3d46fd97 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 02:57:16 2011 +0200 add some missing makefile bits for linux --- build-scripts/linux.mk | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7d3bab0..8859cd0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -119,9 +119,9 @@ build-firefox: copy-firefox: -rm -rf $(FETCH_DIR)/Firefox ## This is so ugly. Update it to use cool tar --transform soon. - cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-pc-linux-gnu/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-pc-linux-gnu/*bz2 $(FETCH_DIR) - cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.bz2 && mv firefox Firefox + cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package + cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(FETCH_DIR) + cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo @@ -233,7 +233,6 @@ all-compressed-bundles: compressed-bundle_ar \ ## clean: - rm -fr $(DISTDIR) rm -fr *.tar.gz rm -fr $(DEST) *.stamp rm -f *~ @@ -280,9 +279,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.2 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.2 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.2 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) @@ -360,8 +359,8 @@ strip-it-stripper: ## ## Torbutton development version -#torbutton.xpi: -# $(WGET) -O $@ $(TORBUTTON) +torbutton.xpi: + $(WGET) -O $@ $(TORBUTTON) ## NoScript development version noscript.xpi: @@ -403,7 +402,6 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); rm *.zip *.xpi - cp torbutton/torbutton.xpi . copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbutton/master] Bug 3580: Fix part of the hotmail breakage.
by mikeperry＠torproject.org 21 Aug '11

21 Aug '11

commit 4a2b483e59424ba8697d39738c014ce27b80e16f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Aug 19 21:50:16 2011 -0700 Bug 3580: Fix part of the hotmail breakage. We were blocking some of their javascript, which they apparently load in object tags? --- src/components/cssblocker.js | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/components/cssblocker.js b/src/components/cssblocker.js index ad2b1ac..bf9ccde 100644 --- a/src/components/cssblocker.js +++ b/src/components/cssblocker.js @@ -312,6 +312,11 @@ ContentPolicy.prototype = { wind = node; } + /* + * This clause does in fact occurr. It causes us to break hotmail + * by blocking some of their javascript.. + * + * https://trac.torproject.org/projects/tor/ticket/3580 if (contentType == 5) { // Object // Never seems to happen.. But it would be nice if we // could handle it either here or shouldProcess, instead of in @@ -322,6 +327,7 @@ ContentPolicy.prototype = { return block; } } + */ if (!wind || !wind.top.location || !wind.top.location.href) { this.logger.safe_log(4, "Skipping no location: ",

1 0

[torbutton/master] Bug 3739: SafeCache policy fails for https->http CORS
by mikeperry＠torproject.org 21 Aug '11

21 Aug '11

commit 349dcb1c5776936a37d21dfd70f9d0d2f1227513 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Aug 20 17:42:20 2011 -0700 Bug 3739: SafeCache policy fails for https->http CORS We use the cookie permissions api to get the origin URI. It can do some magic we can't do from XPCOM. Thanks to Georg Koppen for the tip! --- src/chrome/content/stanford-safecache.js | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index bf2fb16..0b08bda 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -55,6 +55,7 @@ function SSC_dump(msg) { function SSC_RequestListener(controller) { this.controller = controller; + this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"].getService(Ci.nsICookiePermission); } SSC_RequestListener.prototype = @@ -119,10 +120,16 @@ SSC_RequestListener.prototype = parent_host = null; // first party interaction } else if(!parent_host) { // Questionable first party interaction.. - if (!channel.referrer) { - torbutton_safelog(3, "SSC: No parent for ", channel.URI.spec); - } else { - parent_host = channel.referrer.host; + try { + var anuri = this.cookie_permissions.getOriginatingURI(channel); + parent_host = anuri.host; + } catch(e) { + torbutton_safelog(2, "Cookie API failed to get parent: "+e,channel.URI.spec); + if (!channel.referrer) { + torbutton_safelog(3, "SSC: No parent for ", channel.URI.spec); + } else { + parent_host = channel.referrer.host; + } } }

1 0

r24959: {website} Bump versions for new TBBs (website/trunk/include)
by Robert Ransom 20 Aug '11

20 Aug '11

Author: rransom Date: 2011-08-20 20:29:55 +0000 (Sat, 20 Aug 2011) New Revision: 24959 Modified: website/trunk/include/versions.wmi Log: Bump versions for new TBBs Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-20 19:55:51 UTC (rev 24958) +++ website/trunk/include/versions.wmi 2011-08-20 20:29:55 UTC (rev 24959) @@ -21,10 +21,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.26</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.27</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.12-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.13-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -32,17 +32,17 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.12</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.12</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.13</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.13</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.13, zlib-1.2.5, openssl-0.9.8p</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.22</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.23</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.20</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag>

1 0

[gettor/master] remove duplicate "Thank you for your request" line
by arma＠torproject.org 20 Aug '11

20 Aug '11

commit 80a5e94b13fc5d691b7f234d29a0eb3aa60da563 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 20 16:07:39 2011 -0400 remove duplicate "Thank you for your request" line Fixes bug #3383 --- lib/gettor/i18n.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py index 9fec331..6f40bd1 100644 --- a/lib/gettor/i18n.py +++ b/lib/gettor/i18n.py @@ -533,8 +533,7 @@ first file."""), _("""Packages might arrive out of order! Please make sure you received all packages before you attempt to unpack them!"""), # GETTOR_TEXT[38] -_("""Thank you for your request. -It was successfully understood. Your request is currently being processed. +_("""It was successfully understood. Your request is currently being processed. Your package should arrive within the next ten minutes."""), # GETTOR_TEXT[39] _("""If it doesn't arrive, the package might be too big for your mail provider.

1 0

r24958: {website} link to my new research item (website/trunk/getinvolved/en)
by Roger Dingledine 20 Aug '11

20 Aug '11

Author: arma Date: 2011-08-20 19:55:51 +0000 (Sat, 20 Aug 2011) New Revision: 24958 Modified: website/trunk/getinvolved/en/research.wml Log: link to my new research item Modified: website/trunk/getinvolved/en/research.wml =================================================================== --- website/trunk/getinvolved/en/research.wml 2011-08-19 03:29:40 UTC (rev 24957) +++ website/trunk/getinvolved/en/research.wml 2011-08-20 19:55:51 UTC (rev 24958) @@ -138,6 +138,13 @@ <ul> +<li>What algorithm should we use to assign Guard flags such that a) +we assign the flag to as many relays as possible, yet b) we minimize +the chance that Alice will use an attacker's node as a guard? See the +<a href="<blog>/research-problem-better-guard-rotation-parameters">blog +post</a> for details. +</li> + <li>For various diversity metrics, how has the diversity of the Tor network changed over time? How robust is it to change or attack? These results can help us make better design decisions. See the <a

1 0

[gettor/master] get my name out of the strings
by arma＠torproject.org 20 Aug '11

20 Aug '11

commit 1fbe14743b399134ee89ca9840d57a20adcec09a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 20 15:43:35 2011 -0400 get my name out of the strings this should be a start at solving #3304. we still need all the translations to get fixed too. --- README.USER-HOWTO | 2 +- lib/gettor/responses.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.USER-HOWTO b/README.USER-HOWTO index 607c636..f068e02 100644 --- a/README.USER-HOWTO +++ b/README.USER-HOWTO @@ -57,7 +57,7 @@ example reply would look something like the following: The output should look somewhat like this: - gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" + gpg: Good signature from "Erinn Clark <...>" If you're not familiar with commandline tools, try looking for a graphical user interface for GnuPG on this website: diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index 4033a67..47bb7d3 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -64,7 +64,7 @@ def getPackageMsg(t): + t.gettext(i18n.GETTOR_TEXT[29]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[30]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[31]) + "\n\n" \ - + " gpg: Good signature from 'Roger Dingledine <arma(a)mit.edu>'" \ + + " gpg: Good signature from 'Erinn Clark <...>'" \ + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[32]) + "\n\n" \ + " http://www.gnupg.org/related_software/frontends.html" \

1 0