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

[torbrowser/maint-2.4] remove PDF.js from the RC bundles
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit 95791be0aebb7d061f5668a2c7e4092898076771 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 15 18:20:14 2013 -0200 remove PDF.js from the RC bundles --- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index b23c8db..349d512 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -388,7 +388,7 @@ compressed-bundle_%: bundle-localized_%.stamp: make -f linux-alpha.mk copy-files_$* install-extensions \ - install-torbutton install-pdfjs install-lang-extensions \ + install-torbutton install-lang-extensions \ patch-vidalia-language patch-firefox-config patch-pidgin-language touch $(STAMP_DIR)/bundle-localized_$*.stamp diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 83ebc23..fe90785 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -392,7 +392,7 @@ compressed-bundle_%: LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized bundle-localized_%.stamp: make -f osx-alpha.mk copy-files_$* install-torbutton \ - install-httpseverywhere install-noscript install-pdfjs \ + install-httpseverywhere install-noscript \ install-lang-extensions patch-vidalia-language \ patch-firefox-config patch-pidgin-language final touch $(STAMP_DIR)/bundle-localized_$*.stamp diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index b8cdd2a..3bb8850 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -392,7 +392,7 @@ compressed-bundle_%: bundle-localized_%.stamp: make -f windows-alpha.mk copy-files_$* install-extensions \ install-torbutton install-httpseverywhere install-noscript \ - install-pdfjs patch-vidalia-language patch-firefox-config \ + patch-vidalia-language patch-firefox-config \ patch-pidgin-language touch $(STAMP_DIR)/bundle-localized_$*.stamp

1 0

[torbrowser/maint-2.4] use dcf's patch to fix missing geoip issue. closes #10092.
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit be1cafddd4bdc24f9701b5dbe3b869a329b7f26e Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 15 18:07:43 2013 -0200 use dcf's patch to fix missing geoip issue. closes #10092. --- build-scripts/config/mozconfig-lin-i386 | 16 ---------------- build-scripts/osx-alpha.mk | 3 ++- build-scripts/osx.mk | 3 ++- src/current-patches/osx/macosx-tor.sh | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/build-scripts/config/mozconfig-lin-i386 b/build-scripts/config/mozconfig-lin-i386 deleted file mode 100755 index 4421981..0000000 --- a/build-scripts/config/mozconfig-lin-i386 +++ /dev/null @@ -1,16 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser -mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" -mk_add_options MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 - -ac_add_options --disable-optimize -ac_add_options --enable-official-branding -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-maintenance-service -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..83ebc23 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -289,7 +289,8 @@ install-binaries: $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - cp $(TOR) $(APPDIR) + cp $(TOR) $(APPDIR)/tor.real + cp ../src/current-patches/osx/macosx-tor.sh $(APPDIR)/tor ifeq ($(USE_OBFSPROXY),1) cp $(OBFSPROXY) $(APPDIR) endif diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 898a040..349e908 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -252,7 +252,8 @@ install-binaries: $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - cp $(TOR) $(APPDIR) + cp $(TOR) $(APPDIR)/tor.real + cp ../src/current-patches/osx/macosx-tor.sh $(APPDIR)/tor ## Fixup ## Collect up license files diff --git a/src/current-patches/osx/macosx-tor.sh b/src/current-patches/osx/macosx-tor.sh new file mode 100755 index 0000000..5f7c099 --- /dev/null +++ b/src/current-patches/osx/macosx-tor.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# Set the current working directory to the directory containing this executable, +# so that pluggable transport executables can be given with relative paths. This +# works around a change in OS X 10.9, where the current working directory is +# otherwise set to "/" when an application bundle is started from Finder. +# https://trac.torproject.org/projects/tor/ticket/10030 +cd "$(dirname "$0")" +exec ./tor.real "$@"

1 0

[torbrowser/maint-2.4] update changelogs and a few more versions for new TBBs
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit e591565afb6315f0b727e15a83bba10654bb91d2 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 15 18:19:04 2013 -0200 update changelogs and a few more versions for new TBBs --- build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- changelog.linux-2.3 | 7 +++++++ changelog.linux-2.4 | 8 ++++++++ changelog.osx-2.3 | 9 +++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.3 | 7 +++++++ changelog.windows-2.4 | 8 ++++++++ 8 files changed, 55 insertions(+), 6 deletions(-) diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index 46d04b7..7d7f52b 100644 --- a/build-scripts/config/Info.plist +++ b/build-scripts/config/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-2 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.4.17-rc-1</string> + <string>2.4.17-rc-2</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-2 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/config/Info.plist-stable b/build-scripts/config/Info.plist-stable index 2920cf7..f1648cf 100644 --- a/build-scripts/config/Info.plist-stable +++ b/build-scripts/config/Info.plist-stable @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-15 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.3.25-14</string> + <string>2.3.25-15</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-15 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 5a9763b..8156ccc 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-15); suite=linux + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:05 BRST 2013 + Tor Browser Bundle (2.3.25-14); suite=linux * Update Firefox to 17.0.10esr diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 9f79a20..fa6fa24 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.17-rc-2); suite=linux + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Remove PDF.js since it is no longer supported in Firefox 17 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:25 BRST 2013 + Tor Browser Bundle (2.4.17-rc-1); suite=linux * Update Firefox to 17.0.10esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 4f1203c..02b1229 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-15); suite=osx + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Fix paths so Mac OS X 10.9 can find the geoip file. Patch by David Fifield. + (closes: #10092) + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:00 BRST 2013 + Tor Browser Bundle (2.3.25-14); suite=osx * Update Firefox to 17.0.10esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 6d033db..1723072 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.17-rc-2); suite=osx + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Remove PDF.js since it is no longer supported in Firefox 17 + * Fix paths so Mac OS X 10.9 can find the geoip file. Patch by David Fifield. + (closes: #10092) + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:22 BRST 2013 + Tor Browser Bundle (2.4.17-rc-1); suite=osx * Update Firefox to 17.0.10esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index f32cc3a..17d6e5b 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-15); suite=windows + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:02 BRST 2013 + Tor Browser Bundle (2.3.25-14); suite=windows * Update Firefox to 17.0.10esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 2bbc781..a2eff35 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.17-rc-2); suite=windows + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Remove PDF.js since it is no longer supported in Firefox 17 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:24 BRST 2013 + Tor Browser Bundle (2.4.17-rc-1); suite=windows * Update Firefox to 17.0.10esr

1 0

[torbrowser/master] use dcf's patch to fix missing geoip issue. closes #10092.
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit be1cafddd4bdc24f9701b5dbe3b869a329b7f26e Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 15 18:07:43 2013 -0200 use dcf's patch to fix missing geoip issue. closes #10092. --- build-scripts/config/mozconfig-lin-i386 | 16 ---------------- build-scripts/osx-alpha.mk | 3 ++- build-scripts/osx.mk | 3 ++- src/current-patches/osx/macosx-tor.sh | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/build-scripts/config/mozconfig-lin-i386 b/build-scripts/config/mozconfig-lin-i386 deleted file mode 100755 index 4421981..0000000 --- a/build-scripts/config/mozconfig-lin-i386 +++ /dev/null @@ -1,16 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser -mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" -mk_add_options MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 - -ac_add_options --disable-optimize -ac_add_options --enable-official-branding -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-maintenance-service -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..83ebc23 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -289,7 +289,8 @@ install-binaries: $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - cp $(TOR) $(APPDIR) + cp $(TOR) $(APPDIR)/tor.real + cp ../src/current-patches/osx/macosx-tor.sh $(APPDIR)/tor ifeq ($(USE_OBFSPROXY),1) cp $(OBFSPROXY) $(APPDIR) endif diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 898a040..349e908 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -252,7 +252,8 @@ install-binaries: $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - cp $(TOR) $(APPDIR) + cp $(TOR) $(APPDIR)/tor.real + cp ../src/current-patches/osx/macosx-tor.sh $(APPDIR)/tor ## Fixup ## Collect up license files diff --git a/src/current-patches/osx/macosx-tor.sh b/src/current-patches/osx/macosx-tor.sh new file mode 100755 index 0000000..5f7c099 --- /dev/null +++ b/src/current-patches/osx/macosx-tor.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# Set the current working directory to the directory containing this executable, +# so that pluggable transport executables can be given with relative paths. This +# works around a change in OS X 10.9, where the current working directory is +# otherwise set to "/" when an application bundle is started from Finder. +# https://trac.torproject.org/projects/tor/ticket/10030 +cd "$(dirname "$0")" +exec ./tor.real "$@"

1 0

[torbrowser/master] update changelogs and a few more versions for new TBBs
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit e591565afb6315f0b727e15a83bba10654bb91d2 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 15 18:19:04 2013 -0200 update changelogs and a few more versions for new TBBs --- build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- changelog.linux-2.3 | 7 +++++++ changelog.linux-2.4 | 8 ++++++++ changelog.osx-2.3 | 9 +++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.3 | 7 +++++++ changelog.windows-2.4 | 8 ++++++++ 8 files changed, 55 insertions(+), 6 deletions(-) diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index 46d04b7..7d7f52b 100644 --- a/build-scripts/config/Info.plist +++ b/build-scripts/config/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-2 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.4.17-rc-1</string> + <string>2.4.17-rc-2</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-2 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/config/Info.plist-stable b/build-scripts/config/Info.plist-stable index 2920cf7..f1648cf 100644 --- a/build-scripts/config/Info.plist-stable +++ b/build-scripts/config/Info.plist-stable @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-15 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.3.25-14</string> + <string>2.3.25-15</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-15 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 5a9763b..8156ccc 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-15); suite=linux + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:05 BRST 2013 + Tor Browser Bundle (2.3.25-14); suite=linux * Update Firefox to 17.0.10esr diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 9f79a20..fa6fa24 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.17-rc-2); suite=linux + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Remove PDF.js since it is no longer supported in Firefox 17 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:25 BRST 2013 + Tor Browser Bundle (2.4.17-rc-1); suite=linux * Update Firefox to 17.0.10esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 4f1203c..02b1229 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-15); suite=osx + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Fix paths so Mac OS X 10.9 can find the geoip file. Patch by David Fifield. + (closes: #10092) + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:00 BRST 2013 + Tor Browser Bundle (2.3.25-14); suite=osx * Update Firefox to 17.0.10esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 6d033db..1723072 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.17-rc-2); suite=osx + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Remove PDF.js since it is no longer supported in Firefox 17 + * Fix paths so Mac OS X 10.9 can find the geoip file. Patch by David Fifield. + (closes: #10092) + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:22 BRST 2013 + Tor Browser Bundle (2.4.17-rc-1); suite=osx * Update Firefox to 17.0.10esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index f32cc3a..17d6e5b 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-15); suite=windows + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:02 BRST 2013 + Tor Browser Bundle (2.3.25-14); suite=windows * Update Firefox to 17.0.10esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 2bbc781..a2eff35 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.4.17-rc-2); suite=windows + + * Update Firefox to 17.0.11esr + * Update NoScript to 2.6.8.5 + * Remove PDF.js since it is no longer supported in Firefox 17 + + -- Erinn Clark <erinn(a)torproject.org> Fri Nov 15 18:11:24 BRST 2013 + Tor Browser Bundle (2.4.17-rc-1); suite=windows * Update Firefox to 17.0.10esr

1 0

[torbrowser/master] remove PDF.js from the RC bundles
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit 95791be0aebb7d061f5668a2c7e4092898076771 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 15 18:20:14 2013 -0200 remove PDF.js from the RC bundles --- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index b23c8db..349d512 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -388,7 +388,7 @@ compressed-bundle_%: bundle-localized_%.stamp: make -f linux-alpha.mk copy-files_$* install-extensions \ - install-torbutton install-pdfjs install-lang-extensions \ + install-torbutton install-lang-extensions \ patch-vidalia-language patch-firefox-config patch-pidgin-language touch $(STAMP_DIR)/bundle-localized_$*.stamp diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 83ebc23..fe90785 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -392,7 +392,7 @@ compressed-bundle_%: LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized bundle-localized_%.stamp: make -f osx-alpha.mk copy-files_$* install-torbutton \ - install-httpseverywhere install-noscript install-pdfjs \ + install-httpseverywhere install-noscript \ install-lang-extensions patch-vidalia-language \ patch-firefox-config patch-pidgin-language final touch $(STAMP_DIR)/bundle-localized_$*.stamp diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index b8cdd2a..3bb8850 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -392,7 +392,7 @@ compressed-bundle_%: bundle-localized_%.stamp: make -f windows-alpha.mk copy-files_$* install-extensions \ install-torbutton install-httpseverywhere install-noscript \ - install-pdfjs patch-vidalia-language patch-firefox-config \ + patch-vidalia-language patch-firefox-config \ patch-pidgin-language touch $(STAMP_DIR)/bundle-localized_$*.stamp

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 15 Nov '13

15 Nov '13

commit da1ec9ff6d0dd38c9b9657019a313e1968917744 Merge: ea59f69 95791be Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 15 18:20:29 2013 -0200 Merge branch 'maint-2.4' build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- build-scripts/config/mozconfig-lin-i386 | 16 ---------------- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 5 +++-- build-scripts/osx.mk | 3 ++- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 7 +++++++ changelog.linux-2.4 | 8 ++++++++ changelog.osx-2.3 | 9 +++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.3 | 7 +++++++ changelog.windows-2.4 | 8 ++++++++ src/current-patches/osx/macosx-tor.sh | 8 ++++++++ 14 files changed, 70 insertions(+), 27 deletions(-)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Nov '13

15 Nov '13

commit a1b3a98f7d3b1c179b42a00e35c26c2a6375505d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 15 17:45:56 2013 +0000 Update translations for https_everywhere_completed --- da/https-everywhere.dtd | 4 ++++ da/https-everywhere.properties | 1 + 2 files changed, 5 insertions(+) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index fc4058c..0a2a1f0 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -40,3 +40,7 @@ <!ENTITY https-everywhere.popup.paragraph3 "Vi ville sætte pris på at du fortsatte med at anvende vores udvikler-version, og derved hjalp os med at gøre HTTPS Everywhere bedre! Der er optræder måske fejl her og der, som du kan rapportere på https-everywhere(a)eff.org, på engelsk. Vi beklager besværet. Tak fordi du anvender HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Behold udvikler-versionen"> <!ENTITY https-everywhere.popup.revert "Hent den seneste stabile version"> + +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Overalt Regelsæt Prøver"> +<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annullér"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> diff --git a/da/https-everywhere.properties b/da/https-everywhere.properties index 0bcca27..d51d0f6 100644 --- a/da/https-everywhere.properties +++ b/da/https-everywhere.properties @@ -5,3 +5,4 @@ https-everywhere.menu.noRules = (Der er ikke opsat regler for denne side) https-everywhere.menu.unknownRules = (Regler for denne side ukendt) https-everywhere.toolbar.hint = HTTPS Everywhere er nu aktiv. De kan tænde den ved et side-ved-side basis ved at klikke på ikonet i adresse baren. https-everywhere.migration.notification0 = For at rette en vigtig fejl, nulstiller denne opdatering dine HTTPS Everywhere indstillinger til deres oprindelige værdier. +https-everywhere.menu.ruleset-tests = Kør HTTPS Overalt Regelsæt Prøver

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Nov '13

15 Nov '13

commit 0d162e31ade2e308138f5715c17942283c699f6d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 15 17:45:52 2013 +0000 Update translations for https_everywhere --- da/https-everywhere.dtd | 2 +- da/https-everywhere.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 104f865..0a2a1f0 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -41,6 +41,6 @@ <!ENTITY https-everywhere.popup.keep "Behold udvikler-versionen"> <!ENTITY https-everywhere.popup.revert "Hent den seneste stabile version"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Overalt Regelsæt Prøver"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annullér"> <!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> diff --git a/da/https-everywhere.properties b/da/https-everywhere.properties index 266ae13..d51d0f6 100644 --- a/da/https-everywhere.properties +++ b/da/https-everywhere.properties @@ -5,4 +5,4 @@ https-everywhere.menu.noRules = (Der er ikke opsat regler for denne side) https-everywhere.menu.unknownRules = (Regler for denne side ukendt) https-everywhere.toolbar.hint = HTTPS Everywhere er nu aktiv. De kan tænde den ved et side-ved-side basis ved at klikke på ikonet i adresse baren. https-everywhere.migration.notification0 = For at rette en vigtig fejl, nulstiller denne opdatering dine HTTPS Everywhere indstillinger til deres oprindelige værdier. -# https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.menu.ruleset-tests = Kør HTTPS Overalt Regelsæt Prøver

1 0

[stem/master] No-op change for troubleshooting ticket 10132
by atagar＠torproject.org 15 Nov '13

15 Nov '13

commit a6d025d63d576b9c0fae86f8d0ed2afe79d11e77 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 15 09:00:15 2013 -0800 No-op change for troubleshooting ticket 10132 Helix requested a commit to help with troubleshooting... https://trac.torproject.org/10132 --- test/util.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/util.py b/test/util.py index fc9386e..0befa49 100644 --- a/test/util.py +++ b/test/util.py @@ -82,9 +82,11 @@ Target = stem.util.enum.UppercaseEnum( # We make some paths relative to stem's base directory (the one above us) # rather than the process' cwd. This doesn't end with a slash. + STEM_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) -# mapping of files to the issues that should be ignored +# Mapping of files to the issues that should be ignored. + PYFLAKES_IGNORE = None

1 0