Commit b910e7fc authored by Erinn Clark's avatar Erinn Clark
Browse files

Merge branch 'maint-2.2' into maint-2.3

parents 70291a76 86fba5c9

README.LINUX-2.2

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) 
Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)

Firefox 10.0.8esr

 \_ Torbutton 1.4.6.3

 |_ NoScript 2.5.6

 |_ NoScript 2.5.7

 |_ HTTPS-Everywhere 2.2.2



Usage

README.OSX-2.2

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) 
Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)

Firefox 10.0.8esr

 \_ Torbutton 1.4.6.3

 |_ NoScript 2.5.6

 |_ NoScript 2.5.7

 |_ HTTPS-Everywhere 2.2.2



Usage

README.WIN-2.2

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Vidalia 0.2.20 (with Qt 4.8.1) 
Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)

Firefox 10.0.8esr

 \_ Torbutton 1.4.6.3

 |_ NoScript 2.5.6

 |_ NoScript 2.5.7

 |_ HTTPS-Everywhere 2.2.2



Usage

build-scripts/versions.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ FIREFOX_VER=10.0.8esr 
MOZBUILD_VER=1.5.1

PYMAKE_VER=87d436cd8974

TORBUTTON_VER=1.4.6.3

NOSCRIPT_VER=2.5.6

NOSCRIPT_VER=2.5.7

HTTPSEVERYWHERE_VER=2.2.2

OTR_VER=3.2.0

OBFSPROXY_VER=0.1.4

changelog.linux-2.2

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Tor Browser Bundle (2.2.39-2); suite=linux 


  * Update Firefox to 10.0.8esr

  * Update Torbutton to 1.4.6.3

  * Update NoScript to 2.5.6

  * Update NoScript to 2.5.7

  * Update HTTPS Everywhere to 2.2.2

  * Update libpng to 1.5.13