[or-cvs] r20140: {torbrowser} bump to 1.2.4-dev, update tor. (in torbrowser/trunk: . build-scripts)

[phobos@xxxxxxxx]

Author: phobos
Date: 2009-07-24 23:16:53 -0400 (Fri, 24 Jul 2009)
New Revision: 20140

Modified:
   torbrowser/trunk/README
   torbrowser/trunk/build-scripts/Makefile
Log:
bump to 1.2.4-dev, update tor.


Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README	2009-07-24 22:06:44 UTC (rev 20139)
+++ torbrowser/trunk/README	2009-07-25 03:16:53 UTC (rev 20140)
@@ -5,7 +5,7 @@
 ---------------------
 
 Vidalia 0.1.15
-Tor 0.2.1.17-rc (with libevent-1.4.11, zlib-1.2.3 and openssl-0.9.8k) 
+Tor 0.2.1.18 (with libevent-1.4.11, zlib-1.2.3 and openssl-0.9.8k) 
 Polipo 1.0.4
 FirefoxPortable 3.0.11
  \_ Firefox 3.0.11
@@ -200,3 +200,6 @@
 1.2.4: Released 2009-07-11
   Include libeay32.dll from OpenSSL 0.9.8k to make QT happy
   Update Vidalia to 0.1.15
+
+1.2.5: Released
+  update Tor to 0.2.1.18

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2009-07-24 22:06:44 UTC (rev 20139)
+++ torbrowser/trunk/build-scripts/Makefile	2009-07-25 03:16:53 UTC (rev 20140)
@@ -18,7 +18,7 @@
 
 ## Location of bundle components
 VIDALIA=/c/build/vidalia-0.1.15
-TOR=/c/build/tor-0.2.1.17-rc
+TOR=/c/build/tor-0.2.1.18
 POLIPO=/c/build/polipo-1.0.4
 FIREFOX_SRC=/c/build/FirefoxPortable-3.0.11
 PIDGIN_SRC=/c/build/PidginPortable-2.5.8
@@ -41,7 +41,7 @@
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.2.4
+VERSION=1.2.4-dev
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)