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

2014-07-27 Thread translation
commit 68c711f2fee6fae67464ff73b9c4312b0fcfe574 Author: Translation commit bot Date: Sun Jul 27 07:15:03 2014 + Update translations for bridgedb --- es/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/

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

2014-07-27 Thread translation
commit e4ffaa0e99b9733a5435bc3ba7905c2e1663d357 Author: Translation commit bot Date: Sun Jul 27 07:15:06 2014 + Update translations for bridgedb_completed --- es/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/LC_MESSAGES/bridged

[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties

2014-07-27 Thread translation
commit ef05bab5551db9e11288b2d292feb3bf87b18ee0 Author: Translation commit bot Date: Sun Jul 27 07:15:46 2014 + Update translations for torbutton-brandproperties --- sk_SK/brand.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk_SK/brand.properties b/s

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

2014-07-27 Thread translation
commit cd30c6c82c531525e22795a56ccc5dd5b2ce0ce0 Author: Translation commit bot Date: Sun Jul 27 07:15:12 2014 + Update translations for torcheck --- es/torcheck.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 1de2dc

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

2014-07-27 Thread translation
commit 3f117ee829e55adfd02a3aec9fe39d7da669daab Author: Translation commit bot Date: Sun Jul 27 07:15:15 2014 + Update translations for torcheck_completed --- es/torcheck.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po in

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2014-07-27 Thread translation
commit 16cff728e9d47b692cacc11fe7c6cca08553a412 Author: Translation commit bot Date: Sun Jul 27 07:15:42 2014 + Update translations for abouttor-homepage --- sk_SK/aboutTor.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk_SK/aboutTor.dtd b/sk_SK/abo

[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed

2014-07-27 Thread translation
commit e45a59ab5f5a067002df4d89b009b9c720b6449f Author: Translation commit bot Date: Sun Jul 27 07:15:49 2014 + Update translations for torbutton-brandproperties_completed --- sk_SK/brand.properties | 15 +++ 1 file changed, 15 insertions(+) diff --git a/sk_SK/brand.prop

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2014-07-27 Thread translation
commit 99a9abd5f66ff19c755f80493de8304e0185eee9 Author: Translation commit bot Date: Sun Jul 27 07:15:57 2014 + Update translations for torbutton-torbuttondtd --- sk_SK/torbutton.dtd |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk_SK/torbutton.dtd b/sk_SK/

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2014-07-27 Thread translation
commit ffd0efb1ee71d5d376ea1c76f704f0a5b11e0036 Author: Translation commit bot Date: Sun Jul 27 07:45:47 2014 + Update translations for torbutton-torbuttonproperties --- sk_SK/torbutton.properties |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk_SK/torb

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2014-07-27 Thread translation
commit 5b7168a2fbb702d97377e6d232160ad6d0371633 Author: Translation commit bot Date: Sun Jul 27 07:45:36 2014 + Update translations for abouttor-homepage --- sk_SK/aboutTor.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk_SK/aboutTor.dtd b/sk_SK/abo

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2014-07-27 Thread translation
commit 735e0dda08d09d830055ba40227678d387e03788 Author: Translation commit bot Date: Sun Jul 27 08:15:44 2014 + Update translations for torbutton-torbuttonproperties --- sk_SK/torbutton.properties | 32 1 file changed, 16 insertions(+), 16 deletions(-

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2014-07-27 Thread translation
commit 5b1a6dba81503c109f619bb16b43dac27ac7680e Author: Translation commit bot Date: Sun Jul 27 08:45:43 2014 + Update translations for torbutton-torbuttonproperties --- sk_SK/torbutton.properties | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2014-07-27 Thread translation
commit b71f065d50143018b96074920710732173736373 Author: Translation commit bot Date: Sun Jul 27 10:15:45 2014 + Update translations for torbutton-torbuttonproperties --- sk_SK/torbutton.properties |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk_SK/torbutto

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2014-07-27 Thread translation
commit d2b4cee8f39ed4c54e80b97d13f79dc1ef222f43 Author: Translation commit bot Date: Sun Jul 27 10:45:45 2014 + Update translations for torbutton-torbuttonproperties --- sk_SK/torbutton.properties | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sk

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2014-07-27 Thread translation
commit 893c15b6cbafebf607d535d17ad5820dec8aa0ec Author: Translation commit bot Date: Sun Jul 27 11:15:23 2014 + Update translations for tails-greeter --- sk_SK/sk_SK.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2014-07-27 Thread translation
commit b6743e9bdfdf744aa74a78b614f89e0703c60efa Author: Translation commit bot Date: Sun Jul 27 11:15:39 2014 + Update translations for tails-misc --- sk_SK.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 02a5213..2a9ae6c 1006

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2014-07-27 Thread translation
commit 37ef9f61150af8966a7c7ccf9fb3a3d314156e9c Author: Translation commit bot Date: Sun Jul 27 11:45:36 2014 + Update translations for tails-misc --- sk_SK.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 2a9ae6c..79d9441 10

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2014-07-27 Thread translation
commit 094f9d9eea01fed63288c127413c3f3affe1dc12 Author: Translation commit bot Date: Sun Jul 27 11:45:40 2014 + Update translations for tails-misc_completed --- sk_SK.po | 515 ++ 1 file changed, 515 insertions(+) diff --git

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2014-07-27 Thread translation
commit 83df0104dbaaf314a747545e7b4690d38c47e063 Author: Translation commit bot Date: Sun Jul 27 12:15:19 2014 + Update translations for tails-persistence-setup --- sk_SK/sk_SK.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2014-07-27 Thread translation
commit 516b93deb3b3922ffd027f294992e7e460b1a8ea Author: Translation commit bot Date: Sun Jul 27 12:15:25 2014 + Update translations for tails-greeter --- sk_SK/sk_SK.po | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sk_SK/sk_SK.po b/s

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

2014-07-27 Thread translation
commit d5e801f58b193c3fa84e99cb0666ce268d65bf86 Author: Translation commit bot Date: Sun Jul 27 12:45:29 2014 + Update translations for torbirdy --- sk_SK/torbirdy.dtd| 14 +++--- sk_SK/torbirdy.properties | 12 ++-- 2 files changed, 13 insertions(+), 13 del

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2014-07-27 Thread translation
commit 019a69b73cfd576e79f34aa8085cd4c1c56085e1 Author: Translation commit bot Date: Sun Jul 27 12:45:22 2014 + Update translations for tails-greeter --- sk_SK/sk_SK.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po index 99142aa.

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

2014-07-27 Thread translation
commit 95608dd03c9565878d72ec81b50989a2ae859ac2 Author: Translation commit bot Date: Sun Jul 27 15:15:05 2014 + Update translations for bridgedb_completed --- pl/LC_MESSAGES/bridgedb.po | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pl/LC_M

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

2014-07-27 Thread translation
commit 196fff2d0d948601c9cee041ffda96fa3075f998 Author: Translation commit bot Date: Sun Jul 27 15:15:03 2014 + Update translations for bridgedb --- pl/LC_MESSAGES/bridgedb.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/L

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

2014-07-27 Thread translation
commit 82a5477e4e022291287394296e555c6c052cb3b7 Author: Translation commit bot Date: Sun Jul 27 16:15:31 2014 + Update translations for torbirdy_completed --- sk_SK/torbirdy.properties | 19 +++ 1 file changed, 19 insertions(+) diff --git a/sk_SK/torbirdy.properties

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

2014-07-27 Thread translation
commit b0c6269a8f5e3f9f3744c3caa6d58f9a600e7615 Author: Translation commit bot Date: Sun Jul 27 16:15:39 2014 + Update translations for tor-launcher-network-settings --- sk_SK/network-settings.dtd | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sk_SK/ne

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

2014-07-27 Thread translation
commit 4ebe1f5520444c0873eee1ef3642259cc551ca15 Author: Translation commit bot Date: Sun Jul 27 16:15:27 2014 + Update translations for torbirdy --- sk_SK/torbirdy.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sk_SK/torbirdy.properties b/sk_SK/

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

2014-07-27 Thread translation
commit 606056a238d78da10ad7b07c8a03babf5b7d9bff Author: Translation commit bot Date: Sun Jul 27 16:45:35 2014 + Update translations for tor-launcher-network-settings --- sk_SK/network-settings.dtd |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk_SK/network-

[tor-commits] [tor/maint-0.2.4] Confusing log message when circuit can't be extended

2014-07-27 Thread arma
commit 8f70d756fb5af54cc184d4683e445161f91cf1d1 Author: Arlo Breault Date: Sun Jul 27 18:05:01 2014 +0200 Confusing log message when circuit can't be extended --- src/or/control.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c ind

[tor-commits] [tor/maint-0.2.4] add a changes file for bug 12718

2014-07-27 Thread arma
commit 8882dcfc598edde4d78c14ea0b90c8ed7f189274 Author: Roger Dingledine Date: Sun Jul 27 15:41:30 2014 -0400 add a changes file for bug 12718 --- changes/bug12718 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug12718 b/changes/bug12718 new file mode 100644 index 000

[tor-commits] r26897: {website} Add useful links to the trademark faq section headers. (website/trunk/docs/en)

2014-07-27 Thread Matthew Finkel
Author: sysrqb Date: 2014-07-28 03:20:31 + (Mon, 28 Jul 2014) New Revision: 26897 Modified: website/trunk/docs/en/trademark-faq.wml Log: Add useful links to the trademark faq section headers. Modified: website/trunk/docs/en/trademark-faq.wml ===

[tor-commits] r26898: {website} Front page calendar += 2013 financials (website/trunk/en)

2014-07-27 Thread Matt Pagan
Author: mttp Date: 2014-07-28 03:51:30 + (Mon, 28 Jul 2014) New Revision: 26898 Modified: website/trunk/en/index.wml Log: Front page calendar += 2013 financials Modified: website/trunk/en/index.wml === --- website/trunk/en/in

[tor-commits] r26899: {website} Add bad-relays@ to contact page (website/trunk/about/en)

2014-07-27 Thread Matthew Finkel
Author: sysrqb Date: 2014-07-28 03:52:28 + (Mon, 28 Jul 2014) New Revision: 26899 Modified: website/trunk/about/en/contact.wml Log: Add bad-relays@ to contact page Modified: website/trunk/about/en/contact.wml === --- website/

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

2014-07-27 Thread translation
commit ad66b96938424bff4d28b848a02b087eead98692 Author: Translation commit bot Date: Mon Jul 28 06:15:36 2014 + Update translations for tor-launcher-network-settings --- zh_TW/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/network-sett

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

2014-07-27 Thread translation
commit 2a994f1fedb74088ca68e9924ca6b74770b67a51 Author: Translation commit bot Date: Mon Jul 28 06:15:41 2014 + Update translations for tor-launcher-network-settings_completed --- zh_TW/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/ne

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

2014-07-27 Thread translation
commit 55815d83155500d8f22100f346303537e5a4b14c Author: Translation commit bot Date: Mon Jul 28 06:45:08 2014 + Update translations for bridgedb_completed --- fi/LC_MESSAGES/bridgedb.po| 21 +++-- zh_TW/LC_MESSAGES/bridgedb.po | 18 +- 2 files ch

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

2014-07-27 Thread translation
commit f56ee9b4bbf8c4b185f10e70fcffc261817e41aa Author: Translation commit bot Date: Mon Jul 28 06:45:42 2014 + Update translations for tor-launcher-network-settings --- fi/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/network-settings.d

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

2014-07-27 Thread translation
commit ea6caca1e99fb93c63c9c8fdef0d371c00713f94 Author: Translation commit bot Date: Mon Jul 28 06:45:44 2014 + Update translations for tor-launcher-network-settings_completed --- fi/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/network-

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2014-07-27 Thread translation
commit 61ee6cbbc4a17d81493b087e767df905a1ff0101 Author: Translation commit bot Date: Mon Jul 28 06:45:38 2014 + Update translations for tor-launcher-properties_completed --- fi/torlauncher.properties|3 ++- zh_TW/torlauncher.properties |3 ++- 2 files changed, 4 insertions(

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

2014-07-27 Thread translation
commit b86f71c5317b39beda7f5c69a62f4dcd8b59cf33 Author: Translation commit bot Date: Mon Jul 28 06:45:03 2014 + Update translations for bridgedb --- fi/LC_MESSAGES/bridgedb.po|7 --- zh_TW/LC_MESSAGES/bridgedb.po |6 +++--- 2 files changed, 7 insertions(+), 6 deletions(

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2014-07-27 Thread translation
commit cfee47415a296059f07dadb02418fc0793e674ee Author: Translation commit bot Date: Mon Jul 28 06:45:35 2014 + Update translations for tor-launcher-properties --- fi/torlauncher.properties|4 ++-- zh_TW/torlauncher.properties |4 ++-- 2 files changed, 4 insertions(+), 4 de

[tor-commits] [tor/maint-0.2.4] Warn and drop the circuit if we receive an inbound 'relay early' cell

2014-07-27 Thread arma
commit 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 Author: Roger Dingledine Date: Mon Jul 28 02:44:05 2014 -0400 Warn and drop the circuit if we receive an inbound 'relay early' cell Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor v

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

2014-07-27 Thread arma
commit 29a82b5a8b6d5e75a1f8b880933c2a232458d386 Merge: 2126fea 68a2e4c Author: Roger Dingledine Date: Mon Jul 28 02:47:15 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug1038-3 |6 ++ changes/bug12718 |5 + src/or/command.c | 20

[tor-commits] [tor/maint-0.2.5] Confusing log message when circuit can't be extended

2014-07-27 Thread arma
commit 8f70d756fb5af54cc184d4683e445161f91cf1d1 Author: Arlo Breault Date: Sun Jul 27 18:05:01 2014 +0200 Confusing log message when circuit can't be extended --- src/or/control.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c ind

[tor-commits] [tor/master] Confusing log message when circuit can't be extended

2014-07-27 Thread arma
commit 8f70d756fb5af54cc184d4683e445161f91cf1d1 Author: Arlo Breault Date: Sun Jul 27 18:05:01 2014 +0200 Confusing log message when circuit can't be extended --- src/or/control.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c ind

[tor-commits] [tor/maint-0.2.5] Warn and drop the circuit if we receive an inbound 'relay early' cell

2014-07-27 Thread arma
commit 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 Author: Roger Dingledine Date: Mon Jul 28 02:44:05 2014 -0400 Warn and drop the circuit if we receive an inbound 'relay early' cell Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor v

[tor-commits] [tor/maint-0.2.5] add a changes file for bug 12718

2014-07-27 Thread arma
commit 8882dcfc598edde4d78c14ea0b90c8ed7f189274 Author: Roger Dingledine Date: Sun Jul 27 15:41:30 2014 -0400 add a changes file for bug 12718 --- changes/bug12718 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug12718 b/changes/bug12718 new file mode 100644 index 000

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

2014-07-27 Thread arma
commit 29a82b5a8b6d5e75a1f8b880933c2a232458d386 Merge: 2126fea 68a2e4c Author: Roger Dingledine Date: Mon Jul 28 02:47:15 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug1038-3 |6 ++ changes/bug12718 |5 + src/or/command.c | 20

[tor-commits] [tor/master] Warn and drop the circuit if we receive an inbound 'relay early' cell

2014-07-27 Thread arma
commit 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 Author: Roger Dingledine Date: Mon Jul 28 02:44:05 2014 -0400 Warn and drop the circuit if we receive an inbound 'relay early' cell Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor v

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

2014-07-27 Thread arma
commit 6c4a26b8ca3d8f61f55ad63baea2090e44fbc126 Merge: 3f39c0e 29a82b5 Author: Roger Dingledine Date: Mon Jul 28 02:47:43 2014 -0400 Merge branch 'maint-0.2.5' changes/bug1038-3 |6 ++ changes/bug12718 |5 + src/or/command.c | 20 src/or/control.c

[tor-commits] [tor/master] add a changes file for bug 12718

2014-07-27 Thread arma
commit 8882dcfc598edde4d78c14ea0b90c8ed7f189274 Author: Roger Dingledine Date: Sun Jul 27 15:41:30 2014 -0400 add a changes file for bug 12718 --- changes/bug12718 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug12718 b/changes/bug12718 new file mode 100644 index 000

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

2014-07-27 Thread arma
commit 29a82b5a8b6d5e75a1f8b880933c2a232458d386 Merge: 2126fea 68a2e4c Author: Roger Dingledine Date: Mon Jul 28 02:47:15 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug1038-3 |6 ++ changes/bug12718 |5 + src/or/command.c | 20

[tor-commits] [tor/release-0.2.5] fix typo that crept in to 0.2.4.4-alpha

2014-07-27 Thread arma
commit a3d8ffe010d860b65b697767b867c3c37f186e36 Author: Roger Dingledine Date: Thu Jul 24 17:07:39 2014 -0400 fix typo that crept in to 0.2.4.4-alpha --- src/or/channel.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/channel.c b/src/or/channel.c index 964b3f

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

2014-07-27 Thread arma
commit b350ac0860f461028a373a7ff6ce5c1468ef75a6 Merge: 472696e d5558f0 Author: Roger Dingledine Date: Fri Jul 25 12:15:47 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/or.h changes/prop221 |6 ++ 1 file changed, 6 insertions(+) __

[tor-commits] [tor/release-0.2.5] Warn and drop the circuit if we receive an inbound 'relay early' cell

2014-07-27 Thread arma
commit 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 Author: Roger Dingledine Date: Mon Jul 28 02:44:05 2014 -0400 Warn and drop the circuit if we receive an inbound 'relay early' cell Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor v

[tor-commits] [tor/release-0.2.5] get rid of already-merged bug12227 changes file

2014-07-27 Thread arma
commit 472696e8e517609d34db4818af7bb4ff6f68a158 Author: Roger Dingledine Date: Thu Jul 24 19:49:01 2014 -0400 get rid of already-merged bug12227 changes file --- changes/bug12227 |5 - 1 file changed, 5 deletions(-) diff --git a/changes/bug12227 b/changes/bug12227 deleted file mod

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

2014-07-27 Thread arma
commit 1ed77ff72dec9bd2493d7d28fdd21869bcff Merge: a3d8ffe 1b55182 Author: Roger Dingledine Date: Thu Jul 24 19:48:37 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug12227 |5 + 1 file changed, 5 insertions(+) __

[tor-commits] [tor/release-0.2.5] get rid of already-merged prop221 changes file

2014-07-27 Thread arma
commit 2126feaabc3e07dc8f7ad712256de496fbcfb976 Author: Roger Dingledine Date: Fri Jul 25 12:22:05 2014 -0400 get rid of already-merged prop221 changes file --- changes/prop221 |6 -- 1 file changed, 6 deletions(-) diff --git a/changes/prop221 b/changes/prop221 deleted file mode 1

[tor-commits] [tor/release-0.2.5] circuit_build_failed: distinguish "first hop chan failed", "CREATE failed"

2014-07-27 Thread arma
commit d5558f00729992a9abeeb1cb1512004de35ec007 Author: Nick Mathewson Date: Thu Oct 31 16:53:31 2013 -0400 circuit_build_failed: distinguish "first hop chan failed", "CREATE failed" Roger spotted this on tor-dev in his comments on proposal 221. (Actually, detect DESTROY v

[tor-commits] [tor/release-0.2.5] Confusing log message when circuit can't be extended

2014-07-27 Thread arma
commit 8f70d756fb5af54cc184d4683e445161f91cf1d1 Author: Arlo Breault Date: Sun Jul 27 18:05:01 2014 +0200 Confusing log message when circuit can't be extended --- src/or/control.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c ind

[tor-commits] [tor/release-0.2.5] Avoid illegal read off end of an array in prune_v2_cipher_list

2014-07-27 Thread arma
commit 1b551823de6e6c03cf86bcbb7ca1b687c5f16ea6 Author: Nick Mathewson Date: Tue Jun 10 11:11:47 2014 -0400 Avoid illegal read off end of an array in prune_v2_cipher_list This function is supposed to construct a list of all the ciphers in the "v2 link protocol cipher list" that

[tor-commits] [tor/release-0.2.5] add a changes file for bug 12718

2014-07-27 Thread arma
commit 8882dcfc598edde4d78c14ea0b90c8ed7f189274 Author: Roger Dingledine Date: Sun Jul 27 15:41:30 2014 -0400 add a changes file for bug 12718 --- changes/bug12718 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug12718 b/changes/bug12718 new file mode 100644 index 000

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

2014-07-27 Thread arma
commit f4992beb566401241cf1dd1d464f4aaade4751f7 Merge: 2be259f 29a82b5 Author: Roger Dingledine Date: Mon Jul 28 02:48:11 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug1038-3 |6 ++ changes/bug12718 |5 + src/or/channel.c |2 +- src/or/command.c

[tor-commits] [tor/release-0.2.5] Implement proposal 221: Stop sending CREATE_FAST

2014-07-27 Thread arma
commit e001610c99bea661dbefc693ec173a90fcb3ee5e Author: Nick Mathewson Date: Thu Oct 31 16:44:14 2013 -0400 Implement proposal 221: Stop sending CREATE_FAST This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and makes the behavior of "auto" be "look at the consens