[tor-commits] r25608: {website} slightly better flow (website/trunk/donate/en)

2012-04-13 Thread Roger Dingledine
Author: arma Date: 2012-04-14 00:42:40 + (Sat, 14 Apr 2012) New Revision: 25608 Modified: website/trunk/donate/en/donate.wml Log: slightly better flow Modified: website/trunk/donate/en/donate.wml === --- website/trunk/donate/

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

2012-04-13 Thread arma
commit 1614e00a219882c9aa32cef66a013d21ac34880c Merge: aa0c106 86c4b75 Author: Roger Dingledine Date: Fri Apr 13 20:11:04 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug5593 |3 + changes/geoip-april2012 |3 + src/config/geoip| 9553 +++

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

2012-04-13 Thread arma
commit 86c4b750da6f25a0fb5291146dd60f151ae5ad7d Merge: b395b59 dd3f4f1 Author: Nick Mathewson Date: Wed Apr 11 10:04:31 2012 -0400 Merge branch 'bug5593' into maint-0.2.2 changes/bug5593 |3 +++ src/or/connection.c |7 +-- 2 files changed, 8 insertions(+), 2 deletions(-)

[tor-commits] [tor/release-0.2.2] Include a Host: header with any HTTP/1.1 proxy request

2012-04-13 Thread arma
commit dd3f4f1bdbc06137b36181fd3e958de5b8bc4a4e Author: Nick Mathewson Date: Tue Apr 10 12:00:20 2012 -0400 Include a Host: header with any HTTP/1.1 proxy request Bugfix on 0.2.2.1-alpha, which added the orginal HTTP proxy authentication code. Fix for bug 5593. --- changes/bu

[tor-commits] [tor/release-0.2.2] synchronize changelog stanzas with the way master said it

2012-04-13 Thread arma
commit aa0c10611beb4c275f41d0b43216750f7757b325 Author: Roger Dingledine Date: Thu Apr 5 21:34:30 2012 -0400 synchronize changelog stanzas with the way master said it --- ChangeLog | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog ind

[tor-commits] [tor/master] Document unit of bandwidth related options in sample torrc.

2012-04-13 Thread arma
commit 5d7fab947787db42963eb52809e31008d7a6b0e1 Author: Peter Palfrader Date: Fri Apr 13 20:25:36 2012 +0200 Document unit of bandwidth related options in sample torrc. --- changes/bug5621|3 +++ src/config/torrc.bridge.in |2 ++ src/config/torrc.sample.in |2 ++ 3

[tor-commits] r25607: {website} Remove notice about maintenance status of tobb (website/trunk/projects/en)

2012-04-13 Thread Sebastian Hahn
Author: sebastian Date: 2012-04-13 14:17:33 + (Fri, 13 Apr 2012) New Revision: 25607 Modified: website/trunk/projects/en/obfsproxy.wml Log: Remove notice about maintenance status of tobb Modified: website/trunk/projects/en/obfsproxy.wml =

[tor-commits] [obfsproxy/master] Disable safelogging in integration tests.

2012-04-13 Thread asn
commit 978bcf873c5705bf8f5536a5fbbf7447e2165317 Author: George Kadianakis Date: Fri Apr 13 15:23:02 2012 +0200 Disable safelogging in integration tests. --- src/test/tester.py.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/tester.py.in b/src/test/test

[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha

2012-04-13 Thread translation
commit 207875795669fc4467ed524db3a2d3074a6a61f6 Author: Translation commit bot Date: Fri Apr 13 13:15:11 2012 + Update translations for vidalia_alpha --- pt_BR/vidalia_pt_BR.po | 36 ++-- 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a

[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha

2012-04-13 Thread translation
commit c29ee7290d5a382fc6352ed03601f565707a2481 Author: Translation commit bot Date: Fri Apr 13 11:45:12 2012 + Update translations for vidalia_alpha --- pt_BR/vidalia_pt_BR.po | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pt_BR/vidalia_pt_BR

[tor-commits] [translation/vidalia_alpha] Update translations for vidalia_alpha

2012-04-13 Thread translation
commit 197ca8cc2d24255f7b189d09693b1b609f0208c9 Author: Translation commit bot Date: Fri Apr 13 11:15:11 2012 + Update translations for vidalia_alpha --- pt_BR/vidalia_pt_BR.po |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR/vidalia_pt_BR.po b/pt_