[tor-commits] [torbrowser/master] create a maint-2.4 branch for new alpha bundles
erinn at torproject.org
erinn at torproject.org
Sat Dec 1 15:28:51 UTC 2012
commit 29e03cebb75196e10ad73a127bb4bacc799462ac
Author: Erinn Clark <erinn at torproject.org>
Date: Sat Dec 1 15:26:14 2012 +0000
create a maint-2.4 branch for new alpha bundles
---
README.LINUX-2.4 | 29 +++++++++++++++++++++++++++++
README.OSX-2.4 | 23 +++++++++++++++++++++++
README.WIN-2.4 | 27 +++++++++++++++++++++++++++
build-scripts/versions-alpha.mk | 6 +++---
changelog.linux-2.4 | 6 ++++++
changelog.osx-2.4 | 5 +++++
changelog.windows-2.4 | 5 +++++
7 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/README.LINUX-2.4 b/README.LINUX-2.4
new file mode 100644
index 0000000..6a404d5
--- /dev/null
+++ b/README.LINUX-2.4
@@ -0,0 +1,29 @@
+Tor Browser Bundle for GNU/Linux (alpha)
+===============
+
+Included applications
+---------------------
+
+Vidalia 0.2.21 (with Qt 4.8.1)
+Tor 0.2.4.6-alpha (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
+Firefox 10.0.11esr
+ \_ Torbutton 1.4.6.3
+ |_ NoScript 2.6.2
+ |_ HTTPS-Everywhere 4.0development.2
+
+Usage
+-----
+
+Extract the bundle with:
+
+tar -xvzf tor-browser-gnu-linux*.tar.gz
+
+This will create a directory named tor-browser_LANG. Click on this directory or
+cd into it and execute the 'start-tor-browser' script. This will start Vidalia.
+Once Tor has successfully opened a circuit, Firefox will automatically be
+opened.
+
+To exit, close Firefox. Vidalia will automatically clean up and exit.
+
+For more information about bugfixes and other package changes, see the
+changelog in tor-browser_LANG/Docs/changelog.
diff --git a/README.OSX-2.4 b/README.OSX-2.4
new file mode 100644
index 0000000..703353d
--- /dev/null
+++ b/README.OSX-2.4
@@ -0,0 +1,23 @@
+Tor Browser Bundle for Mac OS X (alpha)
+===============
+
+Included applications
+---------------------
+
+Vidalia 0.2.21 (with Qt 4.8.1)
+Tor 0.2.4.6-alpha (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
+Firefox 10.0.11esr
+ \_ Torbutton 1.4.6.3
+ |_ NoScript 2.6.2
+ |_ HTTPS-Everywhere 4.0development.2
+
+Usage
+-----
+
+Unzip the TorBrowser zip file that you downloaded. Click on the
+TorBrowser_LANG.app which will launch Vidalia and then Firefox.
+
+To exit, close Firefox and Vidalia.
+
+For more information about bugfixes and other package changes, see the
+changelog in TorBrowser_LANG.app/Contents/Resources/changelog.
diff --git a/README.WIN-2.4 b/README.WIN-2.4
new file mode 100644
index 0000000..e0b8f09
--- /dev/null
+++ b/README.WIN-2.4
@@ -0,0 +1,27 @@
+Tor Browser Bundle for Windows (alpha)
+===============
+
+Included applications
+---------------------
+
+Vidalia 0.2.21 (with Qt 4.8.1)
+Tor 0.2.4.6-alpha (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
+Firefox 10.0.11esr
+ \_ Torbutton 1.4.6.3
+ |_ NoScript 2.6.2
+ |_ HTTPS-Everywhere 4.0development.2
+
+Usage
+-----
+
+Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run
+this and point it to the install location. It will create a folder called "Tor
+Browser". This may be the hard disk, but is more likely the currently mounted
+USB drive. The install process needs only be performed once.
+
+Once the bundle is extracted, open the newly created folder and click
+"Start Tor Browser.bat" (may appear as simply "Start Tor Browser").
+This will start Vidalia. Once Tor has successfully opened a circuit,
+Firefox will automatically be opened.
+
+To exit, close Firefox. Vidalia will automatically clean up and exit.
diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index 5f3c168..6fd7e61 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -1,14 +1,14 @@
#!/usr/bin/make
-RELEASE_VER=2.3.25-alpha
+RELEASE_VER=2.4.6-alpha
ZLIB_VER=1.2.7
OPENSSL_VER=1.0.1c
LIBPNG_VER=1.5.13
QT_VER=4.8.1
-VIDALIA_VER=0.2.20
+VIDALIA_VER=0.2.21
LIBEVENT_VER=2.0.20-stable
-TOR_VER=0.2.3.25-rc
+TOR_VER=0.2.4.6-alpha
PIDGIN_VER=2.6.4
FIREFOX_VER=10.0.11esr
MOZBUILD_VER=1.5.1
diff --git a/changelog.linux-2.4 b/changelog.linux-2.4
new file mode 100644
index 0000000..7472eb1
--- /dev/null
+++ b/changelog.linux-2.4
@@ -0,0 +1,6 @@
+Tor Browser Bundle (2.4.6-alpha-1); suite=linux
+
+ * Initial release
+
+ -- Erinn Clark <erinn at torproject.org> Sat Dec 1 15:21:21 GMT 2012
+
diff --git a/changelog.osx-2.4 b/changelog.osx-2.4
new file mode 100644
index 0000000..d5d1234
--- /dev/null
+++ b/changelog.osx-2.4
@@ -0,0 +1,5 @@
+Tor Browser Bundle (2.4.6-alpha-1); suite=osx
+
+ * Initial release
+
+ -- Erinn Clark <erinn at torproject.org> Sat Dec 1 15:21:11 GMT 2012
diff --git a/changelog.windows-2.4 b/changelog.windows-2.4
new file mode 100644
index 0000000..33de3b1
--- /dev/null
+++ b/changelog.windows-2.4
@@ -0,0 +1,5 @@
+Tor Browser Bundle (2.4.6-alpha-1); suite=windows
+
+ * Initial release
+
+ -- Erinn Clark <erinn at torproject.org> Sat Dec 1 15:21:17 GMT 2012
More information about the tor-commits
mailing list