[tor-commits] [tor/release-0.2.4] fold in changes entries

2013-08-31 Thread arma
commit 20d4356c3d25e8b2ac23640e249d787f884a25ac Author: Roger Dingledine Date: Sat Aug 31 20:30:28 2013 -0400 fold in changes entries --- ChangeLog | 28 changes/bug9366|4 changes/bug9543|4 --

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

2013-08-31 Thread arma
commit 4107ddd003c6c0f1271ad73a40114350f600dbec Merge: 1ee1c8f cbc53a2 Author: Nick Mathewson Date: Sun Aug 25 00:31:51 2013 -0400 Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4 changes/bug9546| 11 +++ src/or/channeltls.c| 14 -- src

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

2013-08-31 Thread arma
commit a1963695cada32e3728f44ad585a7453ec7ffe3b Merge: 00ca2cc a5610cf Author: Roger Dingledine Date: Sat Aug 31 20:10:58 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9366|4 + changes/bug9543|4 + changes/bug9546

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-08-31 Thread arma
commit a5610cfa64189db693dbad3efaa973d6720c42fe Merge: 4107ddd 8611195 Author: Nick Mathewson Date: Sun Aug 25 00:33:10 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 (Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just merged our own

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-08-31 Thread arma
commit 3433b7ce3992b9566dba9b64f64f0676e712696a Merge: d5cfbf9 64410cc Author: Nick Mathewson Date: Mon Aug 12 09:45:07 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-august2013 |3 + src/config/geoip | 9207 +++-

[tor-commits] [tor/release-0.2.4] Make bridges send AUTH_CHALLENGE cells

2013-08-31 Thread arma
commit 940cef3367591fd1ee86971c202ef92aba931cb7 Author: Nick Mathewson Date: Wed Aug 21 10:10:35 2013 -0400 Make bridges send AUTH_CHALLENGE cells The spec requires them to do so, and not doing so creates a situation where they can't send-test because relays won't extend to the

[tor-commits] [tor/release-0.2.4] Send NETINFO on receiving a NETINFO if we have not yet sent one.

2013-08-31 Thread arma
commit 1bb4a4f9bdf24706a459e4aefb2b0fb75622f7ac Author: Nick Mathewson Date: Tue Aug 20 14:52:56 2013 -0400 Send NETINFO on receiving a NETINFO if we have not yet sent one. Relays previously, when initiating a connection, would only send a NETINFO after sending an AUTHENTICATE.

[tor-commits] [tor/release-0.2.4] Document the correct loglevel for the heartbeat message

2013-08-31 Thread arma
commit edaea773e57cc39e892643bcce12c755810f508b Author: Nick Mathewson Date: Fri Aug 16 21:58:50 2013 -0400 Document the correct loglevel for the heartbeat message --- changes/doc-heartbeat-loglevel |3 +++ doc/tor.1.txt |2 +- 2 files changed, 4 insertions(+), 1 d

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

2013-08-31 Thread arma
commit 1ee1c8fb4fc2e4855dba4387a58162656b5b9f0f Merge: 3727a97 b9f9110 Author: Nick Mathewson Date: Sun Aug 25 00:29:49 2013 -0400 Merge remote-tracking branch 'public/bug9366' into maint-0.2.4 changes/bug9366 |4 src/or/config.c |7 +++ 2 files changed, 11 insertions(+)

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug9564' into maint-0.2.3

2013-08-31 Thread arma
commit 8bf2892f51eb15dcba2a174968efa3cb12d5b6b6 Merge: 64410cc 2530c84 Author: Nick Mathewson Date: Thu Aug 22 20:46:40 2013 -0400 Merge remote-tracking branch 'public/bug9564' into maint-0.2.3 changes/bug9564|5 + src/or/networkstatus.c |2 +- 2 files changed, 6 inser

[tor-commits] [tor/release-0.2.4] Send NETINFO on receiving a NETINFO if we have not yet sent one.

2013-08-31 Thread arma
commit 0daa26a4732234333e67d04c9b215ff6704fa9cd Author: Nick Mathewson Date: Tue Aug 20 14:52:56 2013 -0400 Send NETINFO on receiving a NETINFO if we have not yet sent one. (Backport to Tor 0.2.3) Relays previously, when initiating a connection, would only send a NETIN

[tor-commits] [tor/release-0.2.4] Add a 30-day maximum on user-supplied MaxCircuitDirtiness

2013-08-31 Thread arma
commit af7970b6bcc8e546cf15e943f1bec749cce18eed Author: Nick Mathewson Date: Wed Aug 21 11:35:00 2013 -0400 Add a 30-day maximum on user-supplied MaxCircuitDirtiness Fix for bug 9543. --- changes/bug9543 |4 src/or/config.c | 10 ++ 2 files changed, 14 insertion

[tor-commits] [tor/release-0.2.4] Make bridges send AUTH_CHALLENGE cells

2013-08-31 Thread arma
commit cbc53a2d52a67e49e56ad9d8f5334ad623a59374 Author: Nick Mathewson Date: Wed Aug 21 10:10:35 2013 -0400 Make bridges send AUTH_CHALLENGE cells The spec requires them to do so, and not doing so creates a situation where they can't send-test because relays won't extend to the

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2013-08-31 Thread arma
commit 64410cc8ff964a82613cc53475def98d9de7 Merge: 0b9c515 41bf8fa Author: Nick Mathewson Date: Mon Aug 12 09:44:36 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-august2013 |3 + src/config/geoip | 9207 +++-

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

2013-08-31 Thread arma
commit 8611195a005ed1624bdea0632404a8c00bb19586 Merge: 8bf2892 940cef3 Author: Nick Mathewson Date: Sun Aug 25 00:32:27 2013 -0400 Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3 changes/bug9546| 11 +++ src/or/command.c | 14 --

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-08-31 Thread arma
commit 43f187ec2e40517148c11f8eaa915ec2ae6d1ec4 Merge: edaea77 8bf2892 Author: Nick Mathewson Date: Thu Aug 22 20:47:10 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug9564|5 + src/or/networkstatus.c |2 +- 2 files changed, 6 i

[tor-commits] [tor/release-0.2.4] Replace return with continue in update_consensus_networkstatus_downloads

2013-08-31 Thread arma
commit 2530c842207ecbec0d178fa5ce804a61a1c6ec6c Author: Nick Mathewson Date: Thu Aug 22 10:00:37 2013 -0400 Replace return with continue in update_consensus_networkstatus_downloads Fix for bug 9564; bugfix on 0.2.3.14-alpha. --- changes/bug9564|5 + src/or/networks

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

2013-08-31 Thread arma
commit 3727a978b8ca5015c1d684a0151002cd70ab3426 Merge: 43f187e af7970b Author: Nick Mathewson Date: Sun Aug 25 00:29:06 2013 -0400 Merge remote-tracking branch 'public/bug9543' into maint-0.2.4 changes/bug9543 |4 src/or/config.c | 10 ++ 2 files changed, 14 insertions(

[tor-commits] [tor/release-0.2.4] Don't allow all ORPort values to be NoAdvertise

2013-08-31 Thread arma
commit b9f9110ac77876b0c8c4fda19b6bb138e60da655 Author: Nick Mathewson Date: Mon Aug 5 12:14:48 2013 -0400 Don't allow all ORPort values to be NoAdvertise Fix for bug #9366 --- changes/bug9366 |4 src/or/config.c |7 +++ 2 files changed, 11 insertions(+) diff --g

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2013-08-31 Thread translation
commit cee8a3295fb62a18870c68584ccc71a39679a8cf Author: Translation commit bot Date: Sat Aug 31 17:16:48 2013 + Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/ne

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2013-08-31 Thread translation
commit 58d54ded75c62d14abbb2939fd1a6c53e5ef4cfa Author: Translation commit bot Date: Sat Aug 31 17:16:43 2013 + Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-sett

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2013-08-31 Thread translation
commit fed7a6e806bad687fbb7c94a97039d8c8f0dd2ed Author: Translation commit bot Date: Sat Aug 31 12:46:40 2013 + Update translations for tor-launcher-network-settings_completed --- es/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/network-

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2013-08-31 Thread translation
commit 2407648642323e0c1e7f28e50c8d579670b8af22 Author: Translation commit bot Date: Sat Aug 31 12:46:36 2013 + Update translations for tor-launcher-network-settings --- es/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/network-settings.d

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-08-31 Thread translation
commit ed46084f837faaf6162c00768c5e76f446da1daf Author: Translation commit bot Date: Sat Aug 31 11:46:14 2013 + Update translations for liveusb-creator --- ca/ca.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index 8a791fb..000b4fd 100644

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-08-31 Thread translation
commit 37e73ecbd3f86700f77117d234e83edad12c7557 Author: Translation commit bot Date: Sat Aug 31 11:16:22 2013 + Update translations for liveusb-creator --- ca/ca.po | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ca/ca.po b/ca/ca.po

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

2013-08-31 Thread translation
commit a91f1069ef8ea2c94bcd50d2acf704595cf0dc80 Author: Translation commit bot Date: Sat Aug 31 11:16:14 2013 + Update translations for https_everywhere --- fr/https-everywhere.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr/https-everywhere.dt

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

2013-08-31 Thread translation
commit 1d9a46f8dd269ec53d2a85b598d9eb730d45d2ec Author: Translation commit bot Date: Sat Aug 31 11:16:06 2013 + Update translations for torcheck_completed --- fr/torcheck.po | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck

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

2013-08-31 Thread translation
commit b2ff96f4820e3f733c49ef8bc18bd60a322b1f17 Author: Translation commit bot Date: Sat Aug 31 11:16:19 2013 + Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr/https-eve

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

2013-08-31 Thread translation
commit 44745a18b6933123774c816be9f073ee6b6826f0 Author: Translation commit bot Date: Sat Aug 31 11:16:02 2013 + Update translations for torcheck --- fr/torcheck.po | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-08-31 Thread translation
commit 79245bca6b2e9f16ed530c1740679d44e4431e80 Author: Translation commit bot Date: Sat Aug 31 10:16:14 2013 + Update translations for liveusb-creator --- ca/ca.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 5feccbe..d

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2013-08-31 Thread translation
commit a39d07fab75d5ce43e27d4c5bd864aaed71bafe1 Author: Translation commit bot Date: Sat Aug 31 09:46:45 2013 + Update translations for tor-launcher-network-settings_completed --- ja/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/network-

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2013-08-31 Thread translation
commit 998b13334e8698870e983fe43584481dc74a8bde Author: Translation commit bot Date: Sat Aug 31 09:46:43 2013 + Update translations for tor-launcher-network-settings --- ja/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/network-settings.d

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-08-31 Thread translation
commit 8e151fce30eb303e76fa2af41779f9ac9dd523b4 Author: Translation commit bot Date: Sat Aug 31 09:46:21 2013 + Update translations for liveusb-creator --- ca/ca.po | 39 --- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/ca/ca.po

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

2013-08-31 Thread translation
commit 91365ab7e379407b32f6085f76ddf63281cb863f Author: Translation commit bot Date: Sat Aug 31 09:46:08 2013 + Update translations for torcheck_completed --- ca/torcheck.po | 58 +++- 1 file changed, 24 insertions(+), 34 deletions(

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

2013-08-31 Thread translation
commit e0a1d47bca616b67e47e781c5d90a5e825032b7d Author: Translation commit bot Date: Sat Aug 31 09:46:05 2013 + Update translations for torcheck --- ca/torcheck.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ca/torcheck.po b/ca/torcheck.po index c7f6d

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

2013-08-31 Thread translation
commit beb0b55adfbfeaeae7e89dd77a1ab7e69b503272 Author: Translation commit bot Date: Sat Aug 31 09:16:00 2013 + Update translations for torcheck --- ca/torcheck.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ca/torcheck.po b/ca/torcheck.po index 76

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2013-08-31 Thread translation
commit dbbdb7fc0a302fc26b02a90844c0cbe0210cf0ed Author: Translation commit bot Date: Sat Aug 31 08:47:40 2013 + Update translations for tor-launcher-network-settings_completed --- da/network-settings.dtd |2 +- en/network-settings.dtd |2 +- lv/network-settings.dtd |2 +- 3

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2013-08-31 Thread translation
commit 69597744c56d18cf3a1cf05d37b855701e81a3da Author: Translation commit bot Date: Sat Aug 31 08:47:34 2013 + Update translations for tor-launcher-network-settings --- ar/network-settings.dtd|2 +- cs/network-settings.dtd|2 +- cy/network-settings.dtd|2 +- da

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

2013-08-31 Thread translation
commit 9bd296c79e68762610da90e3d635783122c4c670 Author: Translation commit bot Date: Sat Aug 31 07:45:06 2013 + Update translations for gettor --- vi/gettor.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/gettor.po b/vi/gettor.po index 41d..806a89b 1006

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

2013-08-31 Thread translation
commit 0bc0a603515111acb65ea49e0d67e33e5b7aaf60 Author: Translation commit bot Date: Sat Aug 31 07:15:05 2013 + Update translations for gettor --- vi/gettor.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vi/gettor.po b/vi/gettor.po index dbe1922..