March 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Check for latest Tor Browser user agent.
by dcf＠torproject.org 13 Mar '13

13 Mar '13

commit dab70b79e22448524a4fa84844f8bfa9f34bdec7 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sat Mar 9 11:39:17 2013 -0500 Check for latest Tor Browser user agent. The latest version of the Tor Browser has a new user agent string, check for it in is_likely_tor_browser(). --- proxy/flashproxy.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index bf3fce9..d229087 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -930,9 +930,13 @@ function repr(x) { /* Do we seem to be running in Tor Browser? Check the user-agent string, lack of DOM storage, and no listing of supported MIME types. */ -var TBB_UA = "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0"; +var TBB_UA = [ + "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0", + "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0" +]; + function is_likely_tor_browser() { - return window.navigator.userAgent === TBB_UA + return TBB_UA.indexOf(window.navigator.userAgent) > 0 && window.sessionStorage === null && (window.navigator.mimeTypes && window.navigator.mimeTypes.length === 0); }

1 0

[flashproxy/master] ChangeLog for #8434.
by dcf＠torproject.org 13 Mar '13

13 Mar '13

commit cfc01b675b229fdc43b1fbe7c6c5ea8614e2c035 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 12 22:45:26 2013 -0700 ChangeLog for #8434. --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e582239..8a4b163 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,10 @@ Changes in version 0.12 response, telling proxies how often to poll. Fixes bug 8171. Patch by Alexandre Allaire. + o Updated the Tor Browser check to match the behavior of new Tor + Browsers. Patch by Alexandre Allaire and Arlo Breault. Fixed bug + 8434. + Changes in version 0.11 o Added -4 and -6 options to flashproxy-client and flashproxy-reg-http. (The options already existed in

1 0

[flashproxy/master] Merge pull request #1 from arlolra/useragent
by dcf＠torproject.org 13 Mar '13

13 Mar '13

commit 18d998aa2fe04ac319dc786c0984ea52e5472dfe Merge: 47ddaed 0284153 Author: aallai <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Mar 11 12:59:59 2013 -0700 Merge pull request #1 from arlolra/useragent indexOf returns -1 if value not found proxy/flashproxy.js | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)

1 0

[flashproxy/master] Formatting.
by dcf＠torproject.org 13 Mar '13

13 Mar '13

commit 5d30532d3c122feecd315fa6b15ab88823824679 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 12 22:41:52 2013 -0700 Formatting. --- proxy/flashproxy.js | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index ddd9de3..31a1f60 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -928,14 +928,14 @@ function repr(x) { } } -/* Do we seem to be running in Tor Browser? Check the user-agent string, and no listing of supported MIME types. */ -var TBB_UA = [ +/* Do we seem to be running in Tor Browser? Check the user-agent string and for + no listing of supported MIME types. */ +var TBB_UAS = [ "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0", - "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0" + "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0", ]; - function is_likely_tor_browser() { - return TBB_UA.indexOf(window.navigator.userAgent) > -1 + return TBB_UAS.indexOf(window.navigator.userAgent) > -1 && (window.navigator.mimeTypes && window.navigator.mimeTypes.length === 0); }

1 0

[stem/master] Tutorials still referenced a control_port arg
by atagar＠torproject.org 12 Mar '13

12 Mar '13

commit 92d395c8515e72e9c9b9b89d9e84512419f51aa4 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 12 06:55:22 2013 -0700 Tutorials still referenced a control_port arg Oops. When updating the tutorial tests I guess that I forgot to update the examples. :( --- docs/tutorial/mirror_mirror_on_the_wall.rst | 4 ++-- docs/tutorial/the_little_relay_that_could.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/mirror_mirror_on_the_wall.rst b/docs/tutorial/mirror_mirror_on_the_wall.rst index 617d898..1a7f81d 100644 --- a/docs/tutorial/mirror_mirror_on_the_wall.rst +++ b/docs/tutorial/mirror_mirror_on_the_wall.rst @@ -75,7 +75,7 @@ through tor's control socket... from stem.control import Controller - with Controller.from_port(control_port = 9051) as controller: + with Controller.from_port(port = 9051) as controller: controller.authenticate() for desc in controller.get_network_statuses(): @@ -135,7 +135,7 @@ this to work. def get_bw_to_relay(): bw_to_relay = {} - with Controller.from_port(control_port = 9051) as controller: + with Controller.from_port(port = 9051) as controller: controller.authenticate() for desc in controller.get_server_descriptors(): diff --git a/docs/tutorial/the_little_relay_that_could.rst b/docs/tutorial/the_little_relay_that_could.rst index 96216d1..4f22b5b 100644 --- a/docs/tutorial/the_little_relay_that_could.rst +++ b/docs/tutorial/the_little_relay_that_could.rst @@ -48,7 +48,7 @@ many bytes Tor has sent and received... from stem.control import Controller - with Controller.from_port(control_port = 9051) as controller: + with Controller.from_port(port = 9051) as controller: controller.authenticate() # provide the password here if you set one bytes_read = controller.get_info("traffic/read")

1 0

r26105: {website} scrap live chat due to lack of availability. (website/trunk/about/en)
by Andrew Lewman 12 Mar '13

12 Mar '13

Author: phobos Date: 2013-03-12 13:58:18 +0000 (Tue, 12 Mar 2013) New Revision: 26105 Modified: website/trunk/about/en/contact.wml Log: scrap live chat due to lack of availability. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2013-03-12 02:20:25 UTC (rev 26104) +++ website/trunk/about/en/contact.wml 2013-03-12 13:58:18 UTC (rev 26105) @@ -17,7 +17,6 @@ <li><a href="#email">Email</a></li> <li><a href="#identica">Identi.ca</a></li> <li><a href="#irc">IRC</a></li> - <li><a href="#livechat">Live Chat</a></li> <li><a href="#sms">SMS/Text Messaging</a></li> <li><a href="#phone">Telephone</a></li> </ul> @@ -75,17 +74,6 @@ stuff that is not related to Tor.</li> </ul> - <a id="livechat"></a> - <h3><a class="anchor" href="#livechat">Live Chat</a></h3> - <p>Tor is experimenting with live chat (XMPP/Jabber/GChat). Contact - us at <em>torproject(a)jit.si</em> for live help, questions, or - feedback. This address does not receive emails, only text chat.</p> - - <p>Our OTR fingerprint is 46A1E70E B08EBBD5 F6C51F58 BEC5CA19 11A5FFF9. - Learn more about <a - href="http://www.cypherpunks.ca/otr/">Off-the-Record</a> - Messenging.</p> - <a id="sms"></a> <h3><a class="anchor" href="#sms">SMS/Text Messaging</a></h3> <p>We've started an experimental SMS/Text Messaging contact

1 0

[torbrowser/maint-2.4] bump TBB alpha bundle version
by erinn＠torproject.org 12 Mar '13

12 Mar '13

commit d86f87b2493efb3daa1f3aabaafd6e2dbfa3e752 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 12 12:20:50 2013 +0100 bump TBB alpha bundle version --- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 0b2c2a7..b8e1c7a 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index b18794f..7edbc40 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index c8f0e9b..59a2989 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.10-alpha +RELEASE_VER=2.4.11-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.0k diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 98a797f..02424ec 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] bump TBB alpha bundle version
by erinn＠torproject.org 12 Mar '13

12 Mar '13

commit d86f87b2493efb3daa1f3aabaafd6e2dbfa3e752 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 12 12:20:50 2013 +0100 bump TBB alpha bundle version --- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 0b2c2a7..b8e1c7a 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index b18794f..7edbc40 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index c8f0e9b..59a2989 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.10-alpha +RELEASE_VER=2.4.11-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.0k diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 98a797f..02424ec 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] Windows: fix langpacks so branding displays properly for non-en-US languages
by erinn＠torproject.org 12 Mar '13

12 Mar '13

commit 716548bcc46cd8fb3d352dac8a7c208320ba957a Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Mar 10 18:10:47 2013 +0100 Windows: fix langpacks so branding displays properly for non-en-US languages --- build-scripts/windows-alpha.mk | 6 +++++- build-scripts/windows.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index fdb8610..987200f 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -421,6 +421,8 @@ ifneq ($(LANGCODE), en-US) FFDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/; \ CHROMEDIR="$$FFDIR/chrome/"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.dtd "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.properties "$$CHROMEDIR/$$LC/locale/branding"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ cp config/region.properties \ "$$CHROMEDIR/$$LC/locale/browser-region/"; \ @@ -429,7 +431,9 @@ ifneq ($(LANGCODE), en-US) (cd "$$FFDIR"; \ $(SEVENZIP) u -tzip "$$PFILE" \ "chrome/$$LC/locale/branding/browserconfig.properties" \ - "chrome/$$LC/locale/browser-region/region.properties"); \ + "chrome/$$LC/locale/browser-region/region.properties" \ + "chrome/$$LC/locale/branding/brand.dtd" \ + "chrome/$$LC/locale/branding/brand.properties"); \ rm -rf "$$CHROMEDIR" endif rm -fr $(DUMMYPROFILE) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index bee5aa7..085d9e3 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -378,6 +378,8 @@ ifneq ($(LANGCODE), en-US) FFDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/; \ CHROMEDIR="$$FFDIR/chrome/"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.dtd "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.properties "$$CHROMEDIR/$$LC/locale/branding"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ cp config/region.properties \ "$$CHROMEDIR/$$LC/locale/browser-region/"; \ @@ -386,7 +388,9 @@ ifneq ($(LANGCODE), en-US) (cd "$$FFDIR"; \ $(SEVENZIP) u -tzip "$$PFILE" \ "chrome/$$LC/locale/branding/browserconfig.properties" \ - "chrome/$$LC/locale/browser-region/region.properties"); \ + "chrome/$$LC/locale/browser-region/region.properties" \ + "chrome/$$LC/locale/branding/brand.dtd" \ + "chrome/$$LC/locale/branding/brand.properties"); \ rm -rf "$$CHROMEDIR" endif rm -fr $(DUMMYPROFILE)

1 0

[torbrowser/master] OSX: fix langpacks so branding displays properly for non-en-US languages
by erinn＠torproject.org 12 Mar '13

12 Mar '13

commit 0cc60c313af7ebd80195120c5f0dc58f71d36a08 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Mar 10 17:54:26 2013 +0100 OSX: fix langpacks so branding displays properly for non-en-US languages --- build-scripts/osx-alpha.mk | 6 +++++- build-scripts/osx.mk | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index db1064f..31f15d8 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -436,6 +436,8 @@ ifneq ($(LANGCODE), en-US) FFDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/; \ CHROMEDIR="$$FFDIR/chrome/"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.dtd "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.properties "$$CHROMEDIR/$$LC/locale/branding"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ cp config/region.properties \ "$$CHROMEDIR/$$LC/locale/browser-region/"; \ @@ -443,7 +445,9 @@ ifneq ($(LANGCODE), en-US) > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ (cd "$$FFDIR"; \ zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ - "chrome/$$LC/locale/browser-region/region.properties"); \ + "chrome/$$LC/locale/browser-region/region.properties" \ + "chrome/$$LC/locale/branding/brand.dtd" \ + "chrome/$$LC/locale/branding/brand.properties"); \ rm -rf "$$CHROMEDIR" endif diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 3f52fb7..2df3785 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -101,7 +101,7 @@ TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(B build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig - cp branding/* $(FIREFOX_DIR)/browser/branding/official + cp -r branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build cd $(FIREFOX_DIR) && make -C obj* package touch $(STAMP_DIR)/build-firefox @@ -293,7 +293,7 @@ configure-apps: > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ (cd "$$FFDIR"; \ zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ - "chrome/$$LC/locale/browser-region/region.properties"); \ + "chrome/$$LC/locale/browser-region/region.properties"); \ rm -rf "$$CHROMEDIR" cp config/Info.plist $(DEST)/Contents @@ -376,6 +376,8 @@ ifneq ($(LANGCODE), en-US) FFDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/; \ CHROMEDIR="$$FFDIR/chrome/"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.dtd "$$CHROMEDIR/$$LC/locale/branding"; \ + cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.properties "$$CHROMEDIR/$$LC/locale/branding"; \ mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ cp config/region.properties \ "$$CHROMEDIR/$$LC/locale/browser-region/"; \ @@ -383,7 +385,9 @@ ifneq ($(LANGCODE), en-US) > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ (cd "$$FFDIR"; \ zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ - "chrome/$$LC/locale/browser-region/region.properties"); \ + "chrome/$$LC/locale/browser-region/region.properties" \ + "chrome/$$LC/locale/branding/brand.dtd" \ + "chrome/$$LC/locale/branding/brand.properties"); \ rm -rf "$$CHROMEDIR" endif

1 0