[tor-commits] [torbrowser/master] TBB stable & beta stay on Torbutton 1.5.2. update changelogs, versions, etc.

erinn at torproject.org erinn at torproject.org
Fri Sep 20 17:13:00 UTC 2013


commit 583284ce05d5978efba2afbed6f817fa45b5a2c1
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Sep 19 20:56:49 2013 +0200

    TBB stable & beta stay on Torbutton 1.5.2. update changelogs, versions, etc.
---
 README.LINUX-2.3                |    2 +-
 README.LINUX-2.4                |    2 +-
 README.OSX-2.3                  |    2 +-
 README.OSX-2.4                  |    2 +-
 README.WIN-2.3                  |    2 +-
 README.WIN-2.4                  |    2 +-
 build-scripts/linux.mk          |    2 +-
 build-scripts/versions-alpha.mk |    2 +-
 build-scripts/versions.mk       |    2 +-
 changelog.linux-2.3             |    5 ++---
 changelog.linux-2.4             |    5 ++---
 changelog.osx-2.3               |    5 ++---
 changelog.osx-2.4               |    5 ++---
 changelog.windows-2.3           |    5 ++---
 changelog.windows-2.4           |    5 ++---
 15 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/README.LINUX-2.3 b/README.LINUX-2.3
index 6a3ab66..47e5757 100644
--- a/README.LINUX-2.3
+++ b/README.LINUX-2.3
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.21 (with Qt 4.8.1)
 Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
 Firefox 17.0.9esr
- \_ Torbutton 1.6.2
+ \_ Torbutton 1.5.2
  |_ NoScript 2.6.7.1
  |_ HTTPS-Everywhere 3.4.1
 
diff --git a/README.LINUX-2.4 b/README.LINUX-2.4
index 1e7bb2a..417bbd2 100644
--- a/README.LINUX-2.4
+++ b/README.LINUX-2.4
@@ -7,7 +7,7 @@ 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)
 Firefox 17.0.9esr
- \_ Torbutton 1.6.2
+ \_ Torbutton 1.5.2
  |_ NoScript 2.6.7.1
  |_ HTTPS-Everywhere 4.0development.12
  |_ PDF Viewer 0.8.298
diff --git a/README.OSX-2.3 b/README.OSX-2.3
index f0b04cf..2365adf 100644
--- a/README.OSX-2.3
+++ b/README.OSX-2.3
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.21 (with Qt 4.8.1)
 Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
 Firefox 17.0.9esr
- \_ Torbutton 1.6.2
+ \_ Torbutton 1.5.2
  |_ NoScript 2.6.7.1
  |_ HTTPS-Everywhere 3.4.1
 
diff --git a/README.OSX-2.4 b/README.OSX-2.4
index 28799e5..14b5a73 100644
--- a/README.OSX-2.4
+++ b/README.OSX-2.4
@@ -7,7 +7,7 @@ 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)
 Firefox 17.0.9esr
- \_ Torbutton 1.6.2
+ \_ Torbutton 1.5.2
  |_ NoScript 2.6.7.1
  |_ HTTPS-Everywhere 4.0development.12
  |_ PDF Viewer 0.8.298
diff --git a/README.WIN-2.3 b/README.WIN-2.3
index 1a8d30e..5822f93 100644
--- a/README.WIN-2.3
+++ b/README.WIN-2.3
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.21 (with Qt 4.8.1)
 Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k)
 Firefox 17.0.9esr
- \_ Torbutton 1.6.2
+ \_ Torbutton 1.5.2
  |_ NoScript 2.6.7.1
  |_ HTTPS-Everywhere 3.4.1
 
diff --git a/README.WIN-2.4 b/README.WIN-2.4
index 5b27db2..801216e 100644
--- a/README.WIN-2.4
+++ b/README.WIN-2.4
@@ -7,7 +7,7 @@ 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)
 Firefox 17.0.9esr
- \_ Torbutton 1.6.2
+ \_ Torbutton 1.5.2
  |_ NoScript 2.6.7.1
  |_ HTTPS-Everywhere 4.0development.12
  |_ PDF Viewer 0.8.298
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index d6c2bdc..a692b33 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -250,7 +250,7 @@ install-binaries:
 	cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent.so $(LIBSDIR)
 
 	# libpng
-	cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR)
+	cp -d $(LIBPNG)/libpng16.so* $(LIBSDIR)
 	# OpenSSL
 	cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR)
 	chmod 644 $(LIBSDIR)/libssl.so*
diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index 4ddf7be..d9bbf5c 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -12,7 +12,7 @@ TOR_VER=0.2.4.17-rc
 PIDGIN_VER=2.6.4
 FIREFOX_VER=17.0.9esr
 MOZBUILD_VER=1.5.1
-TORBUTTON_VER=1.6.2
+TORBUTTON_VER=1.5.2
 NOSCRIPT_VER=2.6.7.1
 HTTPSEVERYWHERE_VER=4.0development.12
 PDFJS_VER=0.8.298
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 0926def..c2c1b69 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -12,7 +12,7 @@ TOR_VER=0.2.3.25
 PIDGIN_VER=2.6.4
 FIREFOX_VER=17.0.9esr
 MOZBUILD_VER=1.5.1
-TORBUTTON_VER=1.6.2
+TORBUTTON_VER=1.5.2
 NOSCRIPT_VER=2.6.7.1
 HTTPSEVERYWHERE_VER=3.4.1
 OTR_VER=3.2.0
diff --git a/changelog.linux-2.3 b/changelog.linux-2.3
index 9391f1b..1231fdf 100644
--- a/changelog.linux-2.3
+++ b/changelog.linux-2.3
@@ -2,15 +2,14 @@ Tor Browser Bundle (2.3.25-13); suite=linux
 
   * Update Firefox to 17.0.9esr
     https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#firefox17.0.9
-  * Update Torbutton to 1.6.2
   * Update HTTPS Everywhere to 3.4.1
   * Update NoScript to 2.6.7.1
   * Remove extraneous libevent libraries (closes: #9727)
   * Enable GCC hardening for Tor
   * Firefox patch changes:
-    - Disable filtered results in Startpage (closes: #8839)
+    - Disable filtered results in Startpage omnibox (closes: #8839)
 
- -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 17:58:44 CEST 2013
+ -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 19:56:35 CEST 2013
 
 Tor Browser Bundle (2.3.25-12); suite=linux
 
diff --git a/changelog.linux-2.4 b/changelog.linux-2.4
index 8f7d655..6a9bad3 100644
--- a/changelog.linux-2.4
+++ b/changelog.linux-2.4
@@ -2,16 +2,15 @@ Tor Browser Bundle (2.4.17-beta-2); suite=linux
 
   * Update Firefox to 17.0.9esr
     https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#firefox17.0.9
-  * Update Torbutton to 1.6.2
   * Update LibPNG to 1.6.3
   * Update HTTPS Everywhere to 4.0development.12
   * Update NoScript to 2.6.7.1
   * Remove extraneous libevent libraries (closes: #9727)
   * Enable GCC hardening for Tor
   * Firefox patch changes:
-    - Disable filtered results in Startpage (closes: #8839)
+    - Disable filtered results in Startpage omnibox (closes: #8839)
 
- -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 17:58:44 CEST 2013
+ -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 19:56:35 CEST 2013
 
 Tor Browser Bundle (2.4.17-beta-1); suite=linux
 
diff --git a/changelog.osx-2.3 b/changelog.osx-2.3
index 94d8876..9db8a28 100644
--- a/changelog.osx-2.3
+++ b/changelog.osx-2.3
@@ -2,15 +2,14 @@ Tor Browser Bundle (2.3.25-13); suite=osx
 
   * Update Firefox to 17.0.9esr
     https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#firefox17.0.9
-  * Update Torbutton to 1.6.2
   * Update HTTPS Everywhere to 3.4.1
   * Update NoScript to 2.6.7.1
   * Remove extraneous libevent libraries (closes: #9727)
   * Enable GCC hardening for Tor
   * Firefox patch changes:
-    - Disable filtered results in Startpage (closes: #8839)
+    - Disable filtered results in Startpage omnibox (closes: #8839)
 
- -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 17:58:44 CEST 2013
+ -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 19:56:35 CEST 2013
 
 Tor Browser Bundle (2.3.25-12); suite=osx
 
diff --git a/changelog.osx-2.4 b/changelog.osx-2.4
index 8550b0f..583f60d 100644
--- a/changelog.osx-2.4
+++ b/changelog.osx-2.4
@@ -2,15 +2,14 @@ Tor Browser Bundle (2.4.17-beta-2); suite=osx
 
   * Update Firefox to 17.0.9esr
     https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#firefox17.0.9
-  * Update Torbutton to 1.6.2
   * Update HTTPS Everywhere to 4.0development.12
   * Update NoScript to 2.6.7.1
   * Remove extraneous libevent libraries (closes: #9727)
   * Enable GCC hardening for Tor
   * Firefox patch changes:
-    - Disable filtered results in Startpage (closes: #8839)
+    - Disable filtered results in Startpage omnibox (closes: #8839)
 
- -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 17:58:44 CEST 2013
+ -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 19:56:35 CEST 2013
 
 Tor Browser Bundle (2.4.17-beta-1); suite=osx
 
diff --git a/changelog.windows-2.3 b/changelog.windows-2.3
index b05d8ba..4a77e72 100644
--- a/changelog.windows-2.3
+++ b/changelog.windows-2.3
@@ -2,15 +2,14 @@ Tor Browser Bundle (2.3.25-13); suite=windows
 
   * Update Firefox to 17.0.9esr
     https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#firefox17.0.9
-  * Update Torbutton to 1.6.2
   * Update HTTPS Everywhere to 3.4.1
   * Update NoScript to 2.6.7.1
   * Remove extraneous libevent libraries (closes: #9727)
   * Enable GCC hardening for Tor
   * Firefox patch changes:
-    - Disable filtered results in Startpage (closes: #8839)
+    - Disable filtered results in Startpage omnibox (closes: #8839)
 
- -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 17:58:44 CEST 2013
+ -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 19:56:35 CEST 2013
 
 Tor Browser Bundle (2.3.25-12); suite=windows
 
diff --git a/changelog.windows-2.4 b/changelog.windows-2.4
index c77b364..0946e37 100644
--- a/changelog.windows-2.4
+++ b/changelog.windows-2.4
@@ -2,15 +2,14 @@ Tor Browser Bundle (2.4.17-beta-2); suite=windows
 
   * Update Firefox to 17.0.9esr
     https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#firefox17.0.9
-  * Update Torbutton to 1.6.2
   * Update HTTPS Everywhere to 4.0development.12
   * Update NoScript to 2.6.7.1
   * Remove extraneous libevent libraries (closes: #9727)
   * Enable GCC hardening for Tor
   * Firefox patch changes:
-    - Disable filtered results in Startpage (closes: #8839)
+    - Disable filtered results in Startpage omnibox (closes: #8839)
 
- -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 17:58:44 CEST 2013
+ -- Erinn Clark <erinn at torproject.org>  Thu Sep 19 19:56:35 CEST 2013
 
 Tor Browser Bundle (2.4.17-beta-1); suite=windows
 





More information about the tor-commits mailing list