commit 3dc0f94752e62cfaf435f877f5f100156ad0d130 Author: Erinn Clark erinn@torproject.org Date: Wed Oct 30 20:24:55 2013 -0200
begin updating changelogs and versions for releases of 2.4.17-rc-1 and 2.3.25-14 --- README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 8 ++++---- build-scripts/versions.mk | 8 ++++---- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 9 +++++++++ changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.osx-2.4 | 9 +++++++++ changelog.windows-2.3 | 9 +++++++++ changelog.windows-2.4 | 9 +++++++++ 19 files changed, 83 insertions(+), 29 deletions(-)
diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 47e5757..d602e6d 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,10 +6,10 @@ Included applications
Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr _ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2
Usage ----- diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 2365adf..c279ed7 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,10 +6,10 @@ Included applications
Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr _ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2
Usage ----- diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 5822f93..d7b257d 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,10 +6,10 @@ Included applications
Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr _ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2
Usage ----- diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index 82b97f1..46d04b7 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.16-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-1 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.16-beta-1</string> + <string>2.4.17-rc-1</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.16-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-1 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 be38722..2920cf7 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-12 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-14 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-12</string> + <string>2.3.25-14</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-12 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 4af7a84..813c228 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=2 +BUILD_NUM=1 PLATFORM=Linux
## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a692b33..a922130 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@
## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=Linux
## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..7ad744d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@
## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS
## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ae8081..b68c3c4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@
## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=MacOS
## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index d9bbf5c..ac78816 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,20 +1,20 @@ #!/usr/bin/make
-RELEASE_VER=2.4.17-beta +RELEASE_VER=2.4.17-rc
ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.6.3 +LIBPNG_VER=1.6.6 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.9esr +FIREFOX_VER=17.0.10esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=4.0development.12 +HTTPSEVERYWHERE_VER=3.4.2 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c2c1b69..28861e0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,17 +4,17 @@ RELEASE_VER=2.3.25
ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.6.3 +LIBPNG_VER=1.6.6 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.9esr +FIREFOX_VER=17.0.10esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=3.4.1 +NOSCRIPT_VER=2.6.8.4 +HTTPSEVERYWHERE_VER=3.4.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 76bd01e..56233c4 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### #####################
-BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows
## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 41036fc..7480a4c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### #####################
-BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=Windows
## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 1231fdf..9278246 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-14); suite=linux + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark erinn@torproject.org Wed Oct 30 20:03:42 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=linux
* Update Firefox to 17.0.9esr diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index d909796..0a8cd6f 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=linux + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark erinn@torproject.org Wed Oct 30 20:09:43 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=linux
* Update Firefox to 17.0.9esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 9db8a28..9f04b53 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-14); suite=osx + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark erinn@torproject.org Wed Oct 30 20:03:36 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=osx
* Update Firefox to 17.0.9esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 583f60d..5b5ab72 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=osx + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark erinn@torproject.org Wed Oct 30 20:09:38 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=osx
* Update Firefox to 17.0.9esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 4a77e72..b0661d3 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-14); suite=windows + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark erinn@torproject.org Wed Oct 30 20:03:38 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=windows
* Update Firefox to 17.0.9esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 0946e37..3cb2bb1 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=windows + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark erinn@torproject.org Wed Oct 30 20:09:41 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=windows
* Update Firefox to 17.0.9esr