commit 33bf40c04b19d384be3686375525fb671b8751b9
Author: Erinn Clark <erinn(a)torproject.org>
Date: Sun Aug 11 11:57:40 2013 +0200
update all stable & beta bundle changelogs and READMEs for pending release. also bump Tor to 0.2.4.16-rc in the beta bundles.
---
README.LINUX-2.4 | 2 +-
README.OSX-2.4 | 2 +-
README.WIN-2.4 | 2 +-
build-scripts/config/Info.plist | 6 +++---
build-scripts/config/Info.plist-stable | 6 +++---
build-scripts/linux-alpha.mk | 2 +-
build-scripts/osx-alpha.mk | 2 +-
build-scripts/versions-alpha.mk | 4 ++--
build-scripts/windows-alpha.mk | 2 +-
changelog.linux-2.3 | 7 +++++++
changelog.linux-2.4 | 8 ++++++++
changelog.osx-2.3 | 7 +++++++
changelog.osx-2.4 | 8 ++++++++
changelog.windows-2.3 | 7 +++++++
changelog.windows-2.4 | 8 ++++++++
15 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/README.LINUX-2.4 b/README.LINUX-2.4
index bb8f5ef..b4bba77 100644
--- a/README.LINUX-2.4
+++ b/README.LINUX-2.4
@@ -5,7 +5,7 @@ Included applications
---------------------
Vidalia 0.2.21 (with Qt 4.8.1)
-Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
+Tor 0.2.4.16-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
Firefox 17.0.8esr
\_ Torbutton 1.5.2
|_ NoScript 2.6.7
diff --git a/README.OSX-2.4 b/README.OSX-2.4
index 3b85e20..b392951 100644
--- a/README.OSX-2.4
+++ b/README.OSX-2.4
@@ -5,7 +5,7 @@ Included applications
---------------------
Vidalia 0.2.21 (with Qt 4.8.1)
-Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
+Tor 0.2.4.16-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
Firefox 17.0.8esr
\_ Torbutton 1.5.2
|_ NoScript 2.6.7
diff --git a/README.WIN-2.4 b/README.WIN-2.4
index 92a6a3f..51c6463 100644
--- a/README.WIN-2.4
+++ b/README.WIN-2.4
@@ -5,7 +5,7 @@ Included applications
---------------------
Vidalia 0.2.21 (with Qt 4.8.1)
-Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
+Tor 0.2.4.16-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
Firefox 17.0.8esr
\_ Torbutton 1.5.2
|_ NoScript 2.6.7
diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist
index ce623c8..82b97f1 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.15-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string>
+ <string>Tor Browser Bundle 2.4.16-beta-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.15-beta-1</string>
+ <string>2.4.16-beta-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.15-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string>
+ <string>Tor Browser Bundle 2.4.16-beta-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 fde3839..be38722 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-10 Copyright 2010, 2011, 2012, 2013 The Tor Project</string>
+ <string>Tor Browser Bundle 2.3.25-12 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-10</string>
+ <string>2.3.25-12</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-10 Copyright 2010, 2011, 2012, 2013 The Tor Project</string>
+ <string>Tor Browser Bundle 2.3.25-12 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 d7c9a21..aea6d05 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 b66f1d7..7ad744d 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 160bba3..5fe4f44 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -1,6 +1,6 @@
#!/usr/bin/make
-RELEASE_VER=2.4.15-beta
+RELEASE_VER=2.4.16-beta
ZLIB_VER=1.2.8
OPENSSL_VER=1.0.0k
@@ -8,7 +8,7 @@ LIBPNG_VER=1.5.16
QT_VER=4.8.1
VIDALIA_VER=0.2.21
LIBEVENT_VER=2.0.21-stable
-TOR_VER=0.2.4.15-rc
+TOR_VER=0.2.4.16-rc
PIDGIN_VER=2.6.4
FIREFOX_VER=17.0.8esr
MOZBUILD_VER=1.5.1
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index 813f656..56233c4 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
diff --git a/changelog.linux-2.3 b/changelog.linux-2.3
index 1fee0cc..f7adaa2 100644
--- a/changelog.linux-2.3
+++ b/changelog.linux-2.3
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.3.25-12); suite=linux
+
+ * Re-add the locale pref to the Firefox prefs file to allow for localization
+ of bundles again (closes: #9436)
+
+ -- Erinn Clark <erinn(a)torproject.org> Sun Aug 11 11:51:21 CEST 2013
+
Tor Browser Bundle (2.3.25-11); suite=linux
* Update Firefox to 17.0.8esr
diff --git a/changelog.linux-2.4 b/changelog.linux-2.4
index 112585a..ac28e11 100644
--- a/changelog.linux-2.4
+++ b/changelog.linux-2.4
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.4.16-beta-1); suite=linux
+
+ * Update Tor to 0.2.4.16-rc
+ * Re-add the locale pref to the Firefox prefs file to allow for localization
+ of bundles again (closes: #9436)
+
+ -- Erinn Clark <erinn(a)torproject.org> Sun Aug 11 11:51:39 CEST 2013
+
Tor Browser Bundle (2.4.15-beta-2); suite=linux
* Update Firefox to 17.0.8esr
diff --git a/changelog.osx-2.3 b/changelog.osx-2.3
index d493a98..1cd1f07 100644
--- a/changelog.osx-2.3
+++ b/changelog.osx-2.3
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.3.25-12); suite=osx
+
+ * Re-add the locale pref to the Firefox prefs file to allow for localization
+ of bundles again (closes: #9436)
+
+ -- Erinn Clark <erinn(a)torproject.org> Sun Aug 11 11:51:19 CEST 2013
+
Tor Browser Bundle (2.3.25-11); suite=osx
* Update Firefox to 17.0.8esr
diff --git a/changelog.osx-2.4 b/changelog.osx-2.4
index 153ce3b..90f49d5 100644
--- a/changelog.osx-2.4
+++ b/changelog.osx-2.4
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.4.16-beta-1); suite=osx
+
+ * Update Tor to 0.2.4.16-rc
+ * Re-add the locale pref to the Firefox prefs file to allow for localization
+ of bundles again (closes: #9436)
+
+ -- Erinn Clark <erinn(a)torproject.org> Sun Aug 11 11:51:41 CEST 2013
+
Tor Browser Bundle (2.4.15-beta-2); suite=osx
* Update Firefox to 17.0.8esr
diff --git a/changelog.windows-2.3 b/changelog.windows-2.3
index b25996a..793c0d6 100644
--- a/changelog.windows-2.3
+++ b/changelog.windows-2.3
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.3.25-12); suite=windows
+
+ * Re-add the locale pref to the Firefox prefs file to allow for localization
+ of bundles again (closes: #9436)
+
+ -- Erinn Clark <erinn(a)torproject.org> Sun Aug 11 11:51:23 CEST 2013
+
Tor Browser Bundle (2.3.25-11); suite=windows
* Update Firefox to 17.0.8esr
diff --git a/changelog.windows-2.4 b/changelog.windows-2.4
index c3d275a..de7a0a0 100644
--- a/changelog.windows-2.4
+++ b/changelog.windows-2.4
@@ -1,3 +1,11 @@
+Tor Browser Bundle (2.4.16-beta-1); suite=windows
+
+ * Update Tor to 0.2.4.16-rc
+ * Re-add the locale pref to the Firefox prefs file to allow for localization
+ of bundles again (closes: #9436)
+
+ -- Erinn Clark <erinn(a)torproject.org> Sun Aug 11 11:51:37 CEST 2013
+
Tor Browser Bundle (2.4.15-beta-2); suite=windows
* Update Firefox to 17.0.8esr