[tor-commits] [tor/master] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-12-08 Thread arma
commit 0582746e0d25ef07e925521f9e6eb272725f64ee Merge: 6171bdd ff2c9ac Author: Roger Dingledine a...@torproject.org Date: Thu Dec 8 04:40:15 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-december2011 |3 + src/config/geoip |10429

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-12-08 Thread arma
commit 630337e7626d19f33eba6436dbd0aae1fee94f1e Merge: 06b10cc 0582746 Author: Roger Dingledine a...@torproject.org Date: Thu Dec 8 04:40:30 2011 -0500 Merge branch 'maint-0.2.2' changes/geoip-december2011 |3 + src/config/geoip |10429

[tor-commits] [tor/master] paint bug2474's fix a different neon color

2011-12-08 Thread arma
commit ae07af564e66adb7d6158fb0cfaed92e44d37ee0 Author: Roger Dingledine a...@torproject.org Date: Thu Dec 8 04:41:56 2011 -0500 paint bug2474's fix a different neon color this way people with 80-column logs may read more of the warning --- src/or/main.c |2 +- 1 files

[tor-commits] [tor/master] appease check-spaces

2011-12-08 Thread arma
commit ee8b4b4e6e5cebee97678325f80de374a5a33ccc Author: Sebastian Hahn sebast...@torproject.org Date: Thu Nov 24 09:20:51 2011 +0100 appease check-spaces This re-applies f77f9bddb8bf0dd6e9c3e0d94269aa23f459a272 which got accidentally reverted in

[tor-commits] [tor/master] indent; add comment

2011-12-08 Thread arma
commit 71ecfaa52ff4cd0d71171fea1b68f663114580a8 Author: Nick Mathewson ni...@torproject.org Date: Sun Nov 27 09:24:41 2011 -0500 indent; add comment This re-applies 40a87c4c08be0cdd87a3df283f285b3c2a0c8445 which got accidentally reverted in

[tor-commits] [tor/master] Some more check-spaces stuff

2011-12-08 Thread arma
commit 0f8026ec2359a754550190947138b9168671949e Author: Sebastian Hahn sebast...@torproject.org Date: Thu Dec 8 08:47:09 2011 +0100 Some more check-spaces stuff This re-applies a check-spaces fix that was part of 7920ea55b8d994268d2b07f27316b0f34d8f27e5 and got reverted along

[tor-commits] [doctor/master] Remember fetch times when requesting consensuses.

2011-12-08 Thread karsten
commit 98b595e62dc63053360dc2a99504b36779e1f253 Author: Karsten Loesing karsten.loes...@gmx.net Date: Thu Dec 8 11:32:32 2011 +0100 Remember fetch times when requesting consensuses. --- src/org/torproject/doctor/Download.java | 38 +++

[tor-commits] [doctor/master] Include download statistics in the website report.

2011-12-08 Thread karsten
commit 812c1ab54f4eb99b2518d505274c5d79a4165d84 Author: Karsten Loesing karsten.loes...@gmx.net Date: Thu Dec 8 12:55:38 2011 +0100 Include download statistics in the website report. --- src/org/torproject/doctor/Download.java|9 ++-

[tor-commits] [doctor/master] Fix two silly bugs.

2011-12-08 Thread karsten
commit 19352583b36036713f4951ab829b60d7733888f8 Author: Karsten Loesing karsten.loes...@gmx.net Date: Thu Dec 8 13:33:40 2011 +0100 Fix two silly bugs. --- src/org/torproject/doctor/Download.java |1 + src/org/torproject/doctor/Downloader.java |2 +- 2 files changed, 2

[tor-commits] [tor/master] give 0.2.3.9-alpha a blurb

2011-12-08 Thread arma
commit e44205ee6c3816b8b1f31e62809a8ca053afb033 Author: Roger Dingledine a...@torproject.org Date: Thu Dec 8 15:52:36 2011 -0500 give 0.2.3.9-alpha a blurb --- ChangeLog |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor-cloud/master] Fixed link to us-west-2 image, solves #4675

2011-12-08 Thread runa
commit ca909ab2604715b63cba174d3870beeaf5c4869e Author: Runa A. Sandvik runa.sand...@gmail.com Date: Thu Dec 8 20:58:08 2011 + Fixed link to us-west-2 image, solves #4675 --- html/index.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/html/index.html

[tor-commits] [tor/master] bump to 0.2.3.9-alpha-dev

2011-12-08 Thread arma
commit 7a76994d62a6ab1f1a3f9c7e96a097d0dbd4bc05 Author: Roger Dingledine a...@torproject.org Date: Thu Dec 8 16:25:36 2011 -0500 bump to 0.2.3.9-alpha-dev --- configure.in |2 +- contrib/tor-mingw.nsi.in |2 +- src/win32/orconfig.h |2 +- 3 files changed, 3

[tor-commits] [tor/release-0.2.2] Detect tor_addr_to_str failure in tor_dup_addr.

2011-12-08 Thread arma
commit 3ebe960f3f734322ea3ea471ca6abceb245ca322 Author: Nick Mathewson ni...@torproject.org Date: Wed Nov 23 23:04:10 2011 -0500 Detect tor_addr_to_str failure in tor_dup_addr. This avoids a possible strdup of an uninitialized buffer. Fixes 4529; fix on 0.2.1.3-alpha;

[tor-commits] [tor/release-0.2.2] Fix bug 4530; check return val of tor_addr_lookup correctly

2011-12-08 Thread arma
commit b7015603fa014c91056fa46cb012976a9e166cd3 Author: Nick Mathewson ni...@torproject.org Date: Fri Dec 2 15:37:24 2011 -0500 Fix bug 4530; check return val of tor_addr_lookup correctly Fix on 0.2.1.5-alpha; reported by troll_un --- changes/bug4530 |6 ++

[tor-commits] [tor/release-0.2.2] Don't call tor_tls_set_logged_address till after checking conn-tls

2011-12-08 Thread arma
commit 6171bdd1056e3511b1842ac8a3e17aa349616075 Author: Nick Mathewson ni...@torproject.org Date: Fri Dec 2 16:15:52 2011 -0500 Don't call tor_tls_set_logged_address till after checking conn-tls Fixes bug 4531; partial backport of e27a26d5. --- changes/bug4531|4

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-12-08 Thread arma
commit 0582746e0d25ef07e925521f9e6eb272725f64ee Merge: 6171bdd ff2c9ac Author: Roger Dingledine a...@torproject.org Date: Thu Dec 8 04:40:15 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-december2011 |3 + src/config/geoip |10429

[tor-commits] [torbutton/master] Bug 4603: Lower keep-alive timeout to reduce linkability

2011-12-08 Thread mikeperry
commit 2d4e6e85f27b920acc0ca6f9b9f23aa836ae59d9 Author: Mike Perry mikeperry-...@fscked.org Date: Thu Dec 8 15:30:16 2011 -0800 Bug 4603: Lower keep-alive timeout to reduce linkability 20 seconds seems a decent compromise until we can properly isolate keep-alive connections..

[tor-commits] [torbutton/master] Bug 4099: Disable TLS session tickets to limit linkability

2011-12-08 Thread mikeperry
commit 6ee519475ea1fdafe9dff805d550c9600cf6ce4c Author: Mike Perry mikeperry-...@fscked.org Date: Thu Dec 8 15:36:26 2011 -0800 Bug 4099: Disable TLS session tickets to limit linkability Session IDs are disabled in a TBB patch. --- src/chrome/content/torbutton.js |4 1