- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Merge branches 'bug2406' and 'master'
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e37f7ee0808ce49f7ec3b5fb374cc94c312cce5e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 18 06:15:13 2011 +0100 Merge branches 'bug2406' and 'master'

1 0

[torbrowser/maint-2.2] make new bundles with the right tor in them for 64bit linux
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 12d07a6fd5987de78bb4e858dd4f10579237a76e Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jan 19 20:10:59 2011 -0800 make new bundles with the right tor in them for 64bit linux --- README.Linux | 3 +++ build-scripts/linux.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/README.Linux b/README.Linux index 66f78d7..e2774b0 100644 --- a/README.Linux +++ b/README.Linux @@ -29,6 +29,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.3-1: Released 2011-01-18 + 32-bit only fix: put actual Tor 0.2.2.21-alpha in the tarball + 1.1.3: Released 2011-01-16 Update Tor to 0.2.2.21-alpha Update NoScript to 2.0.9.3 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7939411..2fec9d4 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.3-dev +VERSION=1.1.3-1-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] be more optimistic about release dates
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit ac4849785f323e7e98f567e0623bd7d7e71d5dec Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jan 26 07:18:50 2011 +0100 be more optimistic about release dates --- README.Linux | 2 +- README.OSX | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.Linux b/README.Linux index 24fb022..99d9773 100644 --- a/README.Linux +++ b/README.Linux @@ -29,7 +29,7 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- -1.1.4: Released 2011-01-27 +1.1.4: Released 2011-01-26 Update Tor to 0.2.2.22-alpha Remove useless polipo and privoxy check from shell script diff --git a/README.OSX b/README.OSX index 95802b6..bc96149 100644 --- a/README.OSX +++ b/README.OSX @@ -24,7 +24,7 @@ To exit, close Firefox and Vidalia. Changelog --------- -1.0.12: Released 2011-01-27 +1.0.12: Released 2011-01-26 Update Tor to 0.2.2.22-alpha 1.0.11: Released 2011-01-17

1 0

[torbrowser/maint-2.2] bump tbb windows to 1.3.19 for firefox 3.6.14
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4a8fe511f6f8ef4f574348405ad899307b8ef506 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Mar 5 19:45:30 2011 +0100 bump tbb windows to 1.3.19 for firefox 3.6.14 --- README | 5 ++++- build-scripts/Makefile | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README b/README index da25ca4..b0fb5ec 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.10 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 -FirefoxPortable 3.6.13 +FirefoxPortable 3.6.14 \_ Firefox 3.6.13 \_ Torbutton 1.2.5 \_ HTTPS Everywhere 0.9.9.development.3 @@ -324,3 +324,6 @@ Changelog 1.3.18: Released 2011-02-25 Update Tor to 0.2.1.30 Update HTTPS-Everywhere to 0.9.9.development.3 + +1.3.19: Released 2011-03-03 + Update Firefox to 3.6.14 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 5c4f69f..e88d212 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,14 +18,14 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.13 +FIREFOX_VERSION=3.6.14 PIDGIN_VERSION=2.7.5 ## Location of bundle components VIDALIA=/e/build/vidalia-0.2.10 TOR=/e/build/tor-0.2.1.30 POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13 +FIREFOX_SRC=/e/build/FirefoxPortable-3.6.14 PIDGIN_SRC=/e/build/PidginPortable-2.7.5 ## Location of utility applications @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.18 +VERSION=1.3.19 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] update linux makefile
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 12da9f625360cee87812c4a06be4db7fe3e30c1d Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 25 08:31:30 2011 +0100 update linux makefile --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2fec9d4..acbf68c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -51,7 +51,7 @@ OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.21-alpha +TOR_VER=0.2.2.22-alpha TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.10 ZLIB_VER=1.2.3

1 0

[torbrowser/maint-2.2] bump tbb windows to 1.3.18 for tor 0.2.1.30
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e1622f5efdb8ad46559772b72bab62fd39b0241c Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Feb 27 03:21:58 2011 +0100 bump tbb windows to 1.3.18 for tor 0.2.1.30 --- README | 8 ++++++-- build-scripts/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README b/README index 7085c52..da25ca4 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.1.29 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.1.30 (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 \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 0.9.9.development.2 + \_ HTTPS Everywhere 0.9.9.development.3 PidginPortable 2.7.4 \_ Pidgin 2.7.5 \_ OTR 3.2 @@ -320,3 +320,7 @@ Changelog 1.3.17: Released 2011-01-16 Update Tor to 0.2.1.29 + +1.3.18: Released 2011-02-25 + Update Tor to 0.2.1.30 + Update HTTPS-Everywhere to 0.9.9.development.3 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index e6d416f..5c4f69f 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.29 +TOR=/e/build/tor-0.2.1.30 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.17 +VERSION=1.3.18 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] commit tbb linux 1.1.4 makefile version changes
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f34d9020a24d910c1171600a7b111e28a2305208 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 4 02:06:35 2011 -0800 commit tbb linux 1.1.4 makefile version changes --- build-scripts/linux.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index acbf68c..fe2a788 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -45,7 +45,7 @@ HTTPSEVERY_VER=0.9.9.development.2 FIREFOX_VER=3.6.13 LIBEVENT_VER=1.4.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.0.7 +NOSCRIPT_VER=2.0.9.3 OPENSSL_VER=0.9.8p OTR_VER=3.2.0 PIDGIN_VER=2.6.4 @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.3-1-dev +VERSION=1.1.4-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] bump tbb osx tor version to 0.2.2.22-alpha
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 42174fe7ec7af73dacd8ab69a5a20d04f0f7d478 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jan 25 08:21:13 2011 +0100 bump tbb osx tor version to 0.2.2.22-alpha --- README.OSX | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/README.OSX b/README.OSX index d643844..95802b6 100644 --- a/README.OSX +++ b/README.OSX @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.21-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.22-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 Firefox (Namoroka) 3.6.13 \_ Torbutton 1.2.5 @@ -24,6 +24,9 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.12: Released 2011-01-27 + Update Tor to 0.2.2.22-alpha + 1.0.11: Released 2011-01-17 Update the OS X Makefile to make sure that tor links zlib, libevent and openssl statically. Fixes bug #2406.

1 0

[torbrowser/maint-2.2] add the osx .12/.22-alpha release
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 8b13bbf7e16c4f89b8a8acd6f195547a1baa1a0f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Feb 3 14:12:54 2011 +0100 add the osx .12/.22-alpha release --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 32a0a31..cbf3f59 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -51,7 +51,7 @@ OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.21-alpha +TOR_VER=0.2.2.22-alpha TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.10 ZLIB_VER=1.2.3 @@ -208,7 +208,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.11-dev +VERSION=1.0.12-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/master] add target to tag releases
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 98e786ba3b1274809557b2f83c236d9f9dff32c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 17:17:17 2011 +0100 add target to tag releases --- build-scripts/windows.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index aec0239..302c631 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -472,6 +472,10 @@ write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js +## Tag the release +releasetag: + git tag -s torbrowser-$(VERSION) -m "tagging $(VERSION)" + ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp

1 0