[or-cvs] [torbrowser/master] bump tor & tbb version in windows bundle too

[erinn at torproject.org]

commit 6d6c456738d11bd6e5b06f8980ddc71cf1b0e2de
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Jan 16 14:27:17 2011 +0100

    bump tor & tbb version in windows bundle too
---
 README                 |    5 ++++-
 build-scripts/Makefile |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README b/README
index f468921..7085c52 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Included applications
 ---------------------
 
 Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.1.28 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
+Tor 0.2.1.29 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
 Polipo 1.0.4.1
 FirefoxPortable 3.6.13
  \_ Firefox 3.6.13
@@ -317,3 +317,6 @@ Changelog
 
 1.3.16: Released 2010-01-09
  Update Firefox preferences to be more secure and disable geolocation to address #2338 
+
+1.3.17: Released 2011-01-16
+ Update Tor to 0.2.1.29
diff --git a/build-scripts/Makefile b/build-scripts/Makefile
index 82abf89..e6d416f 100644
--- a/build-scripts/Makefile
+++ b/build-scripts/Makefile
@@ -23,7 +23,7 @@ PIDGIN_VERSION=2.7.5
 
 ## Location of bundle components
 VIDALIA=/e/build/vidalia-0.2.10
-TOR=/e/build/tor-0.2.1.28
+TOR=/e/build/tor-0.2.1.29
 POLIPO=/e/build/polipo-1.0.4.1
 FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13
 PIDGIN_SRC=/e/build/PidginPortable-2.7.5
@@ -49,7 +49,7 @@ DEST="Generic Bundle"
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.16
+VERSION=1.3.17
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)