commit f26274d7233b5de15c700c3d6e4a6367ea00e61e Author: Erinn Clark <erinn@torproject.org> Date: Sun Nov 17 16:47:16 2013 -0200 bump versions for new tor 0.2.4.18-rc release --- README.LINUX-2.4 | 3 +-- README.OSX-2.4 | 3 +-- README.WIN-2.4 | 3 +-- build-scripts/config/Info.plist | 6 +++--- build-scripts/versions-alpha.mk | 4 ++-- changelog.linux-2.4 | 5 +++-- changelog.osx-2.4 | 5 +++-- changelog.windows-2.4 | 5 +++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index d5ba381..e03ab99 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.18-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.11esr \_ Torbutton 1.5.2 |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 - |_ PDF Viewer 0.8.298 Usage ----- diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 59b1a2d..52ba0f0 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.18-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.11esr \_ Torbutton 1.5.2 |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 - |_ PDF Viewer 0.8.298 Usage ----- diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 281e8b3..51925e9 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -5,12 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.18-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.11esr \_ Torbutton 1.5.2 |_ NoScript 2.6.8.5 |_ HTTPS-Everywhere 3.4.2 - |_ PDF Viewer 0.8.298 Usage ----- diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index 7d7f52b..8b626a7 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-2 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.18-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.17-rc-2</string> + <string>2.4.18-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.17-rc-2 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.18-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/versions-alpha.mk b/build-scripts/versions-alpha.mk index 612b16e..0410f41 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.17-rc +RELEASE_VER=2.4.18-rc ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k @@ -8,7 +8,7 @@ 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 +TOR_VER=0.2.4.18-rc PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.11esr MOZBUILD_VER=1.5.1 diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index fa6fa24..1b0f2d5 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,10 +1,11 @@ -Tor Browser Bundle (2.4.17-rc-2); suite=linux +Tor Browser Bundle (2.4.18-rc-1); suite=linux + * Update Tor to 0.2.4.18-rc * 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@torproject.org> Fri Nov 15 18:11:25 BRST 2013 + -- Erinn Clark <erinn@torproject.org> Sun Nov 17 16:41:32 BRST 2013 Tor Browser Bundle (2.4.17-rc-1); suite=linux diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 1723072..d8c0b4a 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,12 +1,13 @@ -Tor Browser Bundle (2.4.17-rc-2); suite=osx +Tor Browser Bundle (2.4.18-rc-1); suite=linux + * Update Tor to 0.2.4.18-rc * 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@torproject.org> Fri Nov 15 18:11:22 BRST 2013 + -- Erinn Clark <erinn@torproject.org> Sun Nov 17 16:41:32 BRST 2013 Tor Browser Bundle (2.4.17-rc-1); suite=osx diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index a2eff35..8282c4a 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,10 +1,11 @@ -Tor Browser Bundle (2.4.17-rc-2); suite=windows +Tor Browser Bundle (2.4.18-rc-1); suite=linux + * Update Tor to 0.2.4.18-rc * 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@torproject.org> Fri Nov 15 18:11:24 BRST 2013 + -- Erinn Clark <erinn@torproject.org> Sun Nov 17 16:41:32 BRST 2013 Tor Browser Bundle (2.4.17-rc-1); suite=windows