August 2011 - tor-commits - lists.torproject.org

[torbrowser/master] bump tbb osx to 1.0.23-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too
by erinn＠torproject.org 19 Aug '11

19 Aug '11

commit c1bc3353c0e74a59d896811e26cb9fb0cd6444ab Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 15:52:36 2011 +0200 bump tbb osx to 1.0.23-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too --- README.OSX | 21 +++++++++++++++------ build-scripts/osx.mk | 14 +++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/README.OSX b/README.OSX index 08ca414..cea0edf 100644 --- a/README.OSX +++ b/README.OSX @@ -4,14 +4,13 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) +Vidalia 0.2.13 (with Qt 4.6.2) +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 -Firefox 3.6.19 +Firefox 3.6.20 \_ Torbutton 1.2.5 - |_ NoScript 2.1.1.2 - |_ HTTPS-Everywhere 1.0.0development.4 - |_ BetterPrivacy 1.51 + |_ NoScript 2.1.2.6 + |_ HTTPS-Everywhere 1.0.0development.5 Usage ----- @@ -24,6 +23,16 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.23: Released 2011-08-19 + Update Tor to 0.2.2.31-rc + Update Vidalia to 0.2.13 + Update Firefox to 3.6.20 + Update Libevent to 2.0.13-stable + Update NoScript to 2.1.2.6 + Update HTTPS-Everywhere to 1.0.0development.5 + Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + 1.0.22: Released 2011-07-13 Update Firefox to 3.6.19 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 0269494..bbcddb5 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -41,19 +41,19 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.19 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=3.6.20 +LIBEVENT_VER=2.0.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.2 +NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=0.9.8p 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.30-rc +TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.12 +VIDALIA_VER=0.2.13 ZLIB_VER=1.2.5 ## Extension IDs @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.22-dev +VERSION=1.0.23-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] bump tbb windows to 1.3.27, update firefox to 3.6.20
by erinn＠torproject.org 19 Aug '11

19 Aug '11

commit 2dbabab39d03002ffbbcc0cbaa3e828d4da305da Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 16:46:21 2011 +0200 bump tbb windows to 1.3.27, update firefox to 3.6.20 --- README | 13 +++++++++---- build-scripts/Makefile | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README b/README index c9df4a1..d7e2cee 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.1.30 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 3.6.19 - \_ Firefox 3.6.19 +FirefoxPortable 3.6.20 + \_ Firefox 3.6.20 \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 1.0.0development.4 + \_ HTTPS Everywhere 1.0.0development.5 PidginPortable 2.7.4 \_ Pidgin 2.7.5 \_ OTR 3.2 @@ -354,3 +354,8 @@ Changelog 1.3.26: Released 2011-07-13 Update Firefox to 3.6.19 + +1.3.27: Released 2011-08-19 + Update Firefox to 3.6.20 + Update Libevent to 2.0.13-stable + Update HTTPS-Everywhere to 1.0.0development.5 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 2d0f6b3..caecf1d 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.19 +FIREFOX_VERSION=3.6.20 PIDGIN_VERSION=2.7.5 ## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.26 +VERSION=1.3.27 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torouter/master] implement #3481
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 5e40918ade723becb9b3e9e388f05442fd62a4e5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 16:15:03 2011 +0200 implement #3481 --- packages/torouter-prep/configs/torrc | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/torouter-prep/configs/torrc b/packages/torouter-prep/configs/torrc index 9ad3a51..29a9526 100644 --- a/packages/torouter-prep/configs/torrc +++ b/packages/torouter-prep/configs/torrc @@ -96,8 +96,8 @@ Nickname Torouter ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must ## be at least 20 KBytes. -#RelayBandwidthRate 100 KBytes # Throttle traffic to 100KB/s (800Kbps) -#RelayBandwidthBurst 200 KBytes # But allow bursts up to 200KB/s (1600Kbps) +RelayBandwidthRate 50KB KBytes +RelayBandwidthBurst 75KB KBytes ## Contact info to be published in the directory, so we can contact you ## if your relay is misconfigured or something else goes wrong. Google @@ -151,7 +151,6 @@ Nickname Torouter ## won't be able to block all the bridges. Also, websites won't treat you ## differently because they won't know you're running Tor. If you can # be a real relay, please do; but if not, be a bridge! - BridgeRelay 1 ExitPolicy reject *:*

1 0

[torouter/master] make us a public bridge by default
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 3fcd1051437b12f3f56bd8d7dc81f58497b9cef5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 16:05:49 2011 +0200 make us a public bridge by default --- packages/torouter-prep/configs/torrc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/torouter-prep/configs/torrc b/packages/torouter-prep/configs/torrc index 7a12e73..9ad3a51 100644 --- a/packages/torouter-prep/configs/torrc +++ b/packages/torouter-prep/configs/torrc @@ -80,7 +80,7 @@ DataDirectory /var/lib/tor ## See https://www.torproject.org/docs/tor-doc-relay for details. ### Required: what port to advertise for incoming Tor connections. -ORPort 9001 +ORPort auto ## If you want to listen on a port other than the one advertised ## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment the ## line below too. You'll need to do ipchains or other port forwarding @@ -151,9 +151,9 @@ Nickname Torouter ## won't be able to block all the bridges. Also, websites won't treat you ## differently because they won't know you're running Tor. If you can # be a real relay, please do; but if not, be a bridge! -ExitPolicy reject *:* -ExitPolicy accept *:* +BridgeRelay 1 +ExitPolicy reject *:* AvoidDiskWrites 1

1 0

[torouter/master] copy over sshd config
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 8f7c217f8470afc02ea678fd37838b01a6b2423c Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 15:23:48 2011 +0200 copy over sshd config --- packages/torouter-prep/src/torouter_config.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index e27c81e..ddeac3e 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -95,6 +95,9 @@ cp $config_dir/dnsmasq.conf /etc/dnsmasq.conf cp $config_dir/ntp.conf /etc/ntp.conf cp $config_dir/openntpd-default /etc/default/openntpd +# Configure ssh +cp $config_dir/sshd_config /etc/ssh/sshd_config + # XXX We should configure ufw here # XXX We should configure denyhosts

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit b18611fa5a246c254074c4f38229f55acedff3b6 Merge: 8f7c217 2ec2f16 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 15:54:52 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/src/runui.py | 2 +- packages/torouter-web/src/tui/config.py | 17 +++++++++++++++++ packages/torouter-web/src/tui/utils/fileio.py | 11 +++++++---- packages/torouter-web/src/tui/view.py | 11 +++++++++++ 4 files changed, 36 insertions(+), 5 deletions(-)

1 0

[torouter/master] add 0.2.3.x stuff
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 4903ee8284c0fdaaed29d1fdaf98c76112c17907 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 15:58:05 2011 +0200 add 0.2.3.x stuff --- packages/torouter-prep/configs/sources.list | 5 +++-- packages/torouter-prep/src/torouter_config.sh | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/torouter-prep/configs/sources.list b/packages/torouter-prep/configs/sources.list index 38ba8fe..42bc62b 100644 --- a/packages/torouter-prep/configs/sources.list +++ b/packages/torouter-prep/configs/sources.list @@ -21,8 +21,9 @@ deb http://deb.torproject.org/torproject.org experimental-squeeze main deb-src http://deb.torproject.org/torproject.org experimental-squeeze main # Tor 0.2.3.x package repo -deb http://deb.torproject.org/torproject.org tor-0.2.3.x-squeeze main -deb-src http://deb.torproject.org/torproject.org tor-0.2.3.x-squeeze main +deb http://deb.torproject.org/torproject.org tor-0.2.3.x-stable main +deb-src http://deb.torproject.org/torproject.org tor-0.2.3.x-stable main + # Torouter project repo deb http://torrouter.torproject.org/torrouter torrouter main diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index ddeac3e..12f7ab3 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -52,6 +52,9 @@ apt-get -y -t squeeze-backports install openntpd # Install Tor and deps: apt-get -y install tor tor-geoipdb +# To build a 0.2.3.x Tor: +# apt-get source tor=0.2.3.1-alpha-1~~squeeze+1 +# Debuild here... # To build with natpmp support apt-get -y -t experimental install libnatpmp-dev

1 0

[torouter/master] Write to /var/tmp/tor-tui
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 2ec2f16558d474ba517d9a2ce337a79c3be55a9d Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 15:59:04 2011 +0200 Write to /var/tmp/tor-tui --- packages/torouter-web/src/tui/utils/fileio.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py index aea5462..0675f3f 100644 --- a/packages/torouter-web/src/tui/utils/fileio.py +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -1,9 +1,12 @@ import os def write(files): + tmp_dir = "/var/tmp/tor-tui" tmpfiles = [] for file in files: - tmpfile = "/var/tmp/" + file[0].split("/")[-1:][0] + ".tmp" + if not os.path.exists(tmp_dir): + os.mkdir(tmp_dir) + tmpfile = tmp_dir + file[0].split("/")[-1:][0] + ".tmp" tmpfiles.append((tmpfile,file[0])) # open the tmp file for write f = open(tmpfile, 'w')

1 0

[torouter/master] Write to /var/tmp
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 61ed2b6b5c7605a9faf4ad531d7dc3f1eb1b1f2d Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 15:54:47 2011 +0200 Write to /var/tmp --- packages/torouter-web/src/tui/utils/fileio.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py index 87c6362..aea5462 100644 --- a/packages/torouter-web/src/tui/utils/fileio.py +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -3,7 +3,7 @@ import os def write(files): tmpfiles = [] for file in files: - tmpfile = "/tmp/" + file[0].split("/")[-1:][0] + ".tmp" + tmpfile = "/var/tmp/" + file[0].split("/")[-1:][0] + ".tmp" tmpfiles.append((tmpfile,file[0])) # open the tmp file for write f = open(tmpfile, 'w')

1 0

[torouter/master] Comment out two testing lines
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 45c581baf28c673e20edb5af58da780311847fbb Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 15:53:01 2011 +0200 Comment out two testing lines --- packages/torouter-web/src/tui/utils/fileio.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py index 3234f1e..87c6362 100644 --- a/packages/torouter-web/src/tui/utils/fileio.py +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -15,7 +15,7 @@ def write(files): for file in tmpfiles: os.rename(file[0], file[1]) -files = [('/tmp/file1','blablbal'),('/tmp/file2','The content'),('/tmp/file3','The content 3')] - -write(files) +# for testing +#files = [('/tmp/file1','blablbal'),('/tmp/file2','The content'),('/tmp/file3','The content 3')] +#write(files)

1 0