commit 1e3b8a5972e4f53f30b6a46eae4282b817b736da Author: Erinn Clark erinn@torproject.org Date: Mon Aug 6 02:16:18 2012 +0100
actually, bump alpha bundles to 2.3.20-alpha-1 --- README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.osx-2.3 | 3 ++- changelog.windows-2.3 | 3 ++- 10 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 76eb1f9..b2c18ce 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,7 +5,7 @@ Included applications ---------------------
Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.20-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 _ Torbutton 1.4.6 |_ NoScript 2.5 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 6846c84..e197239 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,7 +5,7 @@ Included applications ---------------------
Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.20-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 _ Torbutton 1.4.6 |_ NoScript 2.5 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index b164b73..331a2a3 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,7 +5,7 @@ Included applications ---------------------
Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.19-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.20-rc (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 14.0.1 _ Torbutton 1.4.6 |_ NoScript 2.5 diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index a00d000..8427a10 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/osx-alpha.mk b/build-scripts/osx-alpha.mk index e5ff243..c6376fd 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/versions-alpha.mk b/build-scripts/versions-alpha.mk index 6226abe..95625cc 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -8,7 +8,7 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.3.19-rc +TOR_VER=0.2.3.20-rc PIDGIN_VER=2.6.4 FIREFOX_VER=14.0.1 MOZBUILD_VER=1.5.1 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 588f970..5847a34 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/changelog.linux-2.3 b/changelog.linux-2.3 index d47fc8a..b4e14dd 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,5 +1,6 @@ -Tor Browser Bundle (2.3.19-alpha-2); suite=linux +Tor Browser Bundle (2.3.20-alpha-1); suite=linux
+ * Update Tor to 0.2.3.20-rc * Update libpng to 1.5.12 * Update NoScript to 2.5 * Change the urlbar search engine to Startpage (closes: #5925) diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index f31d9f9..2c19644 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,5 +1,6 @@ -Tor Browser Bundle (2.3.19-alpha-2); suite=osx +Tor Browser Bundle (2.3.20-alpha-1); suite=osx
+ * Update Tor to 0.2.3.20-rc * Update NoScript to 2.5 * Change the urlbar search engine to Startpage (closes: #5925) * Firefox patch updates: diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 4774116..9d76818 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,5 +1,6 @@ -Tor Browser Bundle (2.3.19-alpha-2); suite=windows +Tor Browser Bundle (2.3.20-alpha-1); suite=windows
+ * Update Tor to 0.2.3.20-rc * Update NoScript to 2.5 * Change the urlbar search engine to Startpage (closes: #5925) * Firefox patch updates:
tor-commits@lists.torproject.org