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

2015-03-09 Thread translation
commit bf4885f52ac4ff23c1c5b406aa0a422ad681fa89 Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 13:45:14 2015 + Update translations for https_everywhere --- sq/ssl-observatory.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[tor-commits] [tor-browser-bundle/master] Bug 15023: Build MAR tools archive deterministically.

2015-03-09 Thread gk
commit bc8eb2befd19fd13798f9a0527b2fa821555408e Author: Kathy Brade br...@pearlcrescent.com Date: Fri Mar 6 16:38:48 2015 -0500 Bug 15023: Build MAR tools archive deterministically. Use dzip.sh to create the mar-tools-*.zip files. --- gitian/descriptors/linux/gitian-firefox.yml

[tor-commits] [tor/master] Be exact about the number of spaces in the header.

2015-03-09 Thread nickm
commit 034f51dd0223b4d2969a3ecc2f0dc661b07bc6f1 Author: cypherpunks cypherpu...@torproject.org Date: Fri Mar 6 15:08:45 2015 +0100 Be exact about the number of spaces in the header. Also fixes changes files that warn on this. --- changes/bug14806 |4 ++--

[tor-commits] [tor/master] Add `check-changes` rule for checking formatting of changes files.

2015-03-09 Thread nickm
commit 9dc90a5b7bf02bc9a034b57bdbc1588745d00447 Author: cypherpunks cypherpu...@torproject.org Date: Fri Mar 6 11:56:57 2015 +0100 Add `check-changes` rule for checking formatting of changes files. Additional fixes to make the change work; - fix Python 2 vs 3 issues - fix

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

2015-03-09 Thread translation
commit f12878c69eca4081a3067054993b8b866913ce0b Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 13:15:13 2015 + Update translations for https_everywhere --- bg/https-everywhere.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2015-03-09 Thread translation
commit 4139bc32b8c5458bf3bb7b2f24677d526d6b2e1e Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 13:15:17 2015 + Update translations for https_everywhere_completed --- bg/https-everywhere.dtd |2 ++ 1 file changed, 2 insertions(+) diff --git

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

2015-03-09 Thread translation
commit 99399eed0acdc319ef5514dc207b3127425cd1c5 Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 14:15:14 2015 + Update translations for https_everywhere --- sq/ssl-observatory.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.6] Changes file for 15188

2015-03-09 Thread nickm
commit 42d877f0847f5541108328c52fb671740b888a18 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:13:57 2015 -0400 Changes file for 15188 --- changes/15188 |3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/15188 b/changes/15188 new file mode 100644 index

[tor-commits] [tor/maint-0.2.6] testing_common.c: avoid side-effects of tor_assert

2015-03-09 Thread nickm
commit d39ede7f202b931506c1126b63665eaed4676abf Author: Tom van der Woerdt i...@tvdw.eu Date: Sun Mar 8 19:20:56 2015 +0100 testing_common.c: avoid side-effects of tor_assert --- src/test/testing_common.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git

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

2015-03-09 Thread nickm
commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea Merge: 2bcb596 addffcc Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:08:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

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

2015-03-09 Thread translation
commit c2dfb898d7c80cc65bbe39874c84ac7ffb3293a9 Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 14:45:13 2015 + Update translations for https_everywhere --- sq/ssl-observatory.dtd | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-)

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-09 Thread nickm
commit bd80ba9a9fd8309dc97e812e6e889dc3ad622b86 Merge: 034f51d a7f75b2 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:10:04 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug15083 | 10 ++ src/or/buffers.c | 11 +-- 2 files

[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-03-09 Thread nickm
commit 1a7419c3df300483f111923daca43febc33b368b Merge: 51e3602 6704e18 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:09:30 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-03-09 Thread nickm
commit a7f75b2056b8bdf59d064268c53a10ac46972380 Merge: de2c5ad 1a7419c Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:09:49 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

[tor-commits] [tor/maint-0.2.5] Do not leave empty, invalid chunks in buffers during buf_pullup

2015-03-09 Thread nickm
commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch

[tor-commits] [tor/maint-0.2.6] Adjust changes header

2015-03-09 Thread nickm
commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index

[tor-commits] [tor/maint-0.2.5] Adjust changes header

2015-03-09 Thread nickm
commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index

[tor-commits] [tor/master] Do not leave empty, invalid chunks in buffers during buf_pullup

2015-03-09 Thread nickm
commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-03-09 Thread nickm
commit a7f75b2056b8bdf59d064268c53a10ac46972380 Merge: de2c5ad 1a7419c Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:09:49 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

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

2015-03-09 Thread nickm
commit 1a7419c3df300483f111923daca43febc33b368b Merge: 51e3602 6704e18 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:09:30 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

[tor-commits] [tor/maint-0.2.6] Make the assert related to 15083 a tiny bit more tolerant

2015-03-09 Thread nickm
commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 |6 +- src/or/buffers.c |9 - 2 files changed, 13

[tor-commits] [tor/master] Make the assert related to 15083 a tiny bit more tolerant

2015-03-09 Thread nickm
commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 |6 +- src/or/buffers.c |9 - 2 files changed, 13

[tor-commits] [tor/master] Adjust changes header

2015-03-09 Thread nickm
commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index

[tor-commits] [tor/maint-0.2.3] Make the assert related to 15083 a tiny bit more tolerant

2015-03-09 Thread nickm
commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 |6 +- src/or/buffers.c |9 - 2 files changed, 13

[tor-commits] [tor/maint-0.2.3] Adjust changes header

2015-03-09 Thread nickm
commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index

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

2015-03-09 Thread translation
commit 9d91f2a9df656ef0ffc77cab22168a084566fbc8 Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 15:45:13 2015 + Update translations for https_everywhere --- sq/ssl-observatory.dtd | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff

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

2015-03-09 Thread nickm
commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea Merge: 2bcb596 addffcc Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:08:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

[tor-commits] [tor/maint-0.2.3] Do not leave empty, invalid chunks in buffers during buf_pullup

2015-03-09 Thread nickm
commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch

[tor-commits] [tor/maint-0.2.4] Make the assert related to 15083 a tiny bit more tolerant

2015-03-09 Thread nickm
commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 |6 +- src/or/buffers.c |9 - 2 files changed, 13

[tor-commits] [tor/maint-0.2.4] Do not leave empty, invalid chunks in buffers during buf_pullup

2015-03-09 Thread nickm
commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch

[tor-commits] [tor/maint-0.2.5] Make the assert related to 15083 a tiny bit more tolerant

2015-03-09 Thread nickm
commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 |6 +- src/or/buffers.c |9 - 2 files changed, 13

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

2015-03-09 Thread nickm
commit 1a7419c3df300483f111923daca43febc33b368b Merge: 51e3602 6704e18 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:09:30 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

[tor-commits] [tor/maint-0.2.4] Adjust changes header

2015-03-09 Thread nickm
commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index

[tor-commits] [tor/maint-0.2.6] Do not leave empty, invalid chunks in buffers during buf_pullup

2015-03-09 Thread nickm
commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch

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

2015-03-09 Thread nickm
commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea Merge: 2bcb596 addffcc Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:08:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

[tor-commits] [stem/master] Move run_tests.py argument handling to its own file

2015-03-09 Thread atagar
commit 287f7d64c617bdfa4646184782ed22421d5cab3b Author: Damian Johnson ata...@torproject.org Date: Mon Mar 9 09:10:21 2015 -0700 Move run_tests.py argument handling to its own file This is a pattern I like that we used for our interpreter. Our run_tests.py was getting a bit

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

2015-03-09 Thread translation
commit ee6c6b9b5b7b08ec86ed34aae155632c6fd4dbf9 Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 16:15:12 2015 + Update translations for https_everywhere --- sq/ssl-observatory.dtd | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-)

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

2015-03-09 Thread translation
commit f277bd6926147ce0fc28899aa72df51e7d21696d Author: Translation commit bot translat...@torproject.org Date: Mon Mar 9 16:15:17 2015 + Update translations for https_everywhere_completed --- sq/ssl-observatory.dtd | 101 1 file

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5

2015-03-09 Thread nickm
commit e3408248b9373e52114773555d73f71492e30129 Merge: 410ce4c 6830667 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:12:54 2015 -0400 Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 changes/bug13988 |3 +++ src/or/rephist.c |4 +--- 2 files

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-03-09 Thread nickm
commit 5c08a19eda04906cc56d6f8fa1943bc385723412 Merge: 8450f6e 64bfc29 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:23:32 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing

[tor-commits] [tor/master] Make boostrap events include hostname ANDaddr AND digest

2015-03-09 Thread nickm
commit 98822df3dcdf7cd0456aee7898507dd3059f930b Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 4 14:23:59 2015 +0100 Make boostrap events include hostname ANDaddr AND digest --- src/or/control.c | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) diff

[tor-commits] [tor/master] Include a HOST item in BOOTSTRAP problem messages

2015-03-09 Thread nickm
commit 79c69d18b76e8836593e1beb3d239a5ff5e63a7b Author: Nick Mathewson ni...@torproject.org Date: Fri Feb 27 11:28:30 2015 -0500 Include a HOST item in BOOTSTRAP problem messages Closes ticket 15006. --- changes/feature15006 |4 src/or/control.c | 11 +++ 2

[tor-commits] [tor/release-0.2.6] changes file for 15037

2015-03-09 Thread nickm
commit 0f2f8fd68a54707bb256b446cff524f0e1ef1658 Author: Nick Mathewson ni...@torproject.org Date: Thu Feb 26 15:24:43 2015 -0500 changes file for 15037 --- changes/bug15037 |4 1 file changed, 4 insertions(+) diff --git a/changes/bug15037 b/changes/bug15037 new file mode 100644

[tor-commits] [tor/release-0.2.6] Use configured Python binary in test-stem.

2015-03-09 Thread nickm
commit 334f74f6f123411c74cfd4c8614e40110c34690a Author: cypherpunks cypherpu...@torproject.org Date: Thu Feb 26 10:38:09 2015 +0100 Use configured Python binary in test-stem. --- Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am

[tor-commits] [tor/release-0.2.6] Include a HOST item in BOOTSTRAP problem messages

2015-03-09 Thread nickm
commit 79c69d18b76e8836593e1beb3d239a5ff5e63a7b Author: Nick Mathewson ni...@torproject.org Date: Fri Feb 27 11:28:30 2015 -0500 Include a HOST item in BOOTSTRAP problem messages Closes ticket 15006. --- changes/feature15006 |4 src/or/control.c | 11 +++ 2

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-03-09 Thread nickm
commit 51df1f9906510521d1641841d6687e1ab700800a Merge: fec73c8 51e3602 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 24 13:25:32 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing

[tor-commits] [tor/release-0.2.6] Missing dependencies; fixes 15127.

2015-03-09 Thread nickm
commit 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 4 12:09:33 2015 +0100 Missing dependencies; fixes 15127. --- changes/bug15127 |3 +++ src/common/include.am |1 + src/or/include.am |1 + 3 files changed, 5

[tor-commits] [tor/master] Changes file for 15188

2015-03-09 Thread nickm
commit 42d877f0847f5541108328c52fb671740b888a18 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:13:57 2015 -0400 Changes file for 15188 --- changes/15188 |3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/15188 b/changes/15188 new file mode 100644 index

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-09 Thread nickm
commit ed7f2482e2de6f5d08dfcd605626ae8ee373cace Merge: 0ec135b fb0de57 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:08:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/feature15006 |4 src/or/control.c | 15 +++ 2 files

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5

2015-03-09 Thread nickm
commit e3408248b9373e52114773555d73f71492e30129 Merge: 410ce4c 6830667 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:12:54 2015 -0400 Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 changes/bug13988 |3 +++ src/or/rephist.c |4 +--- 2 files

[tor-commits] [tor/master] Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6

2015-03-09 Thread nickm
commit fb0de57ba28d92421748cd3db54221c0813fdb0e Merge: 42d877f 98822df Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:05:27 2015 -0400 Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6 changes/feature15006 |4 src/or/control.c | 15

[tor-commits] [tor/maint-0.2.6] Restore c89 in 0.2.5

2015-03-09 Thread nickm
commit 64bfc2930ac0be3af669636c16f6f0bba715056f Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:22:58 2015 -0400 Restore c89 in 0.2.5 --- src/or/control.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index

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

2015-03-09 Thread nickm
commit b70a0a01ec99064e23ccf56c7ff6d0bec397b2f7 Merge: dc06c07 6704e18 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:37:22 2015 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +-- 2 files changed, 19

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

2015-03-09 Thread nickm
commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea Merge: 2bcb596 addffcc Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:08:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

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

2015-03-09 Thread nickm
commit b0fff2a9c52c92de1b4a304b2ed8ef175642c22c Merge: 4b54ad0 64bfc29 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:36:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 changes/bug13988|3 + changes/bug14013

[tor-commits] [tor/release-0.2.6] Reformat 0.2.6.4-beta changelog

2015-03-09 Thread nickm
commit 101d299f1e99bbbd25cad2bef8c63386a36f8459 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:49:12 2015 -0400 Reformat 0.2.6.4-beta changelog --- ChangeLog | 38 -- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.6] We actually merged this one a while ago.

2015-03-09 Thread nickm
commit c066f2d30b36f242867093ae33cd61a6ecd310f1 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:49:55 2015 -0400 We actually merged this one a while ago. --- changes/ticket14128 |5 - 1 file changed, 5 deletions(-) diff --git a/changes/ticket14128

[tor-commits] [tor/maint-0.2.6] Make boostrap events include hostname ANDaddr AND digest

2015-03-09 Thread nickm
commit 98822df3dcdf7cd0456aee7898507dd3059f930b Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 4 14:23:59 2015 +0100 Make boostrap events include hostname ANDaddr AND digest --- src/or/control.c | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) diff

[tor-commits] [tor/maint-0.2.6] Include a HOST item in BOOTSTRAP problem messages

2015-03-09 Thread nickm
commit 79c69d18b76e8836593e1beb3d239a5ff5e63a7b Author: Nick Mathewson ni...@torproject.org Date: Fri Feb 27 11:28:30 2015 -0500 Include a HOST item in BOOTSTRAP problem messages Closes ticket 15006. --- changes/feature15006 |4 src/or/control.c | 11 +++ 2

[tor-commits] [tor/maint-0.2.5] Increase limit for status vote download size by a factor of 5.

2015-03-09 Thread nickm
commit ceb6dee4652567fd503e5ceb9345354efd935a1b Author: Nick Mathewson ni...@torproject.org Date: Sun Jan 18 15:25:29 2015 -0500 Increase limit for status vote download size by a factor of 5. We've started to hit the limit here. We introduced the limit in 0.1.2.5-alpha. This

[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-03-09 Thread nickm
commit 5c08a19eda04906cc56d6f8fa1943bc385723412 Merge: 8450f6e 64bfc29 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:23:32 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5

2015-03-09 Thread nickm
commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:17:20 2015 -0400 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 changes/bug14261 |5 + src/or/directory.c |9 -

[tor-commits] [tor/master] GETINFO bw-event-cache to get information on recent BW events

2015-03-09 Thread nickm
commit 62631904cb403ee9f27080a1cf096e8ddd8a3048 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:37:23 2015 -0500 GETINFO bw-event-cache to get information on recent BW events Closes 14128; useful to regain functionality lost because of 13988. --- changes/ticket14128

[tor-commits] [tor/master] Restore c89 in 0.2.5

2015-03-09 Thread nickm
commit 64bfc2930ac0be3af669636c16f6f0bba715056f Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:22:58 2015 -0400 Restore c89 in 0.2.5 --- src/or/control.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index

[tor-commits] [tor/maint-0.2.5] Add wait4 to the seccomp2 sandbox allowable syscall list

2015-03-09 Thread nickm
commit d5b2cbea106e020436d577e42672d281400558dd Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 4 12:18:10 2015 +0100 Add wait4 to the seccomp2 sandbox allowable syscall list fixes bug 15088. patch from sanic. --- changes/bug15088 |4 src/common/sandbox.c |

[tor-commits] [torspec/master] Fix issues noted by atagar

2015-03-09 Thread nickm
commit 21be1dbeeb90e031d90f1af38041ea7f80573d64 Author: Nick Mathewson ni...@torproject.org Date: Fri Feb 27 11:42:48 2015 -0500 Fix issues noted by atagar --- control-spec.txt | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/control-spec.txt

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5

2015-03-09 Thread nickm
commit 410ce4cb49016b86a95056c8997d020c0c95d930 Merge: 1a7419c d5b2cbe Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:09:50 2015 -0400 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 changes/bug15088 |4 src/common/sandbox.c |1 + 2

[tor-commits] [torspec/master] Add an atagar-suggested clarification

2015-03-09 Thread nickm
commit b941a70418d0e4c6afc8f0c4ab5dc82576c2ea2f Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:07:55 2015 -0400 Add an atagar-suggested clarification --- control-spec.txt |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt

[tor-commits] [torspec/master] Merge branch 'feature15006'

2015-03-09 Thread nickm
commit b4d3d46858695b82bcfad668531693d1916ba580 Merge: ab64534 b941a70 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:08:03 2015 -0400 Merge branch 'feature15006' control-spec.txt | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-)

[tor-commits] [tor/maint-0.2.6] GETINFO bw-event-cache to get information on recent BW events

2015-03-09 Thread nickm
commit 62631904cb403ee9f27080a1cf096e8ddd8a3048 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:37:23 2015 -0500 GETINFO bw-event-cache to get information on recent BW events Closes 14128; useful to regain functionality lost because of 13988. --- changes/ticket14128

[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5

2015-03-09 Thread nickm
commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:17:20 2015 -0400 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 changes/bug14261 |5 + src/or/directory.c |9 -

[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5

2015-03-09 Thread nickm
commit 410ce4cb49016b86a95056c8997d020c0c95d930 Merge: 1a7419c d5b2cbe Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:09:50 2015 -0400 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 changes/bug15088 |4 src/common/sandbox.c |1 + 2

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5

2015-03-09 Thread nickm
commit 410ce4cb49016b86a95056c8997d020c0c95d930 Merge: 1a7419c d5b2cbe Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:09:50 2015 -0400 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 changes/bug15088 |4 src/common/sandbox.c |1 + 2

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-03-09 Thread nickm
commit 8450f6e9a04be27f828f27a916f6560518741ca8 Merge: fb0de57 448bd22 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:21:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/ticket14128 |5 + 1 file changed, 5 insertions(+)

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-09 Thread nickm
commit 4af742fe9744b1fb81287daa920dca726771275c Merge: ed7f248 5c08a19 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:24:26 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/ticket14128 |5 + 1 file changed, 5 insertions(+)

[tor-commits] [tor/release-0.2.5] Enlarge the buffer for a line in a bw file

2015-03-09 Thread nickm
commit 2b9d48791d0b5245e3ccfd267150dfa34541c87c Author: Sebastian Hahn sebast...@torproject.org Date: Wed Jan 7 12:43:21 2015 +0100 Enlarge the buffer for a line in a bw file --- changes/bug14125 |5 + src/or/dirserv.c |2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.2.4] Do not leave empty, invalid chunks in buffers during buf_pullup

2015-03-09 Thread nickm
commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch

[tor-commits] [tor/release-0.2.4] Adjust changes header

2015-03-09 Thread nickm
commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index

[tor-commits] [tor/release-0.2.4] Make the assert related to 15083 a tiny bit more tolerant

2015-03-09 Thread nickm
commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 |6 +- src/or/buffers.c |9 - 2 files changed, 13

[tor-commits] [tor/release-0.2.5] Faravahar's New IP Address as of 2/20/2015

2015-03-09 Thread nickm
commit 8e61d38cf107560a55ebdb8397230f3d88548745 Author: Sina Rabbani s...@redteam.net Date: Fri Feb 13 09:47:43 2015 -0800 Faravahar's New IP Address as of 2/20/2015 --- changes/ticket14487 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff

[tor-commits] [tor/release-0.2.5] GETINFO bw-event-cache to get information on recent BW events

2015-03-09 Thread nickm
commit 62631904cb403ee9f27080a1cf096e8ddd8a3048 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:37:23 2015 -0500 GETINFO bw-event-cache to get information on recent BW events Closes 14128; useful to regain functionality lost because of 13988. --- changes/ticket14128

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5

2015-03-09 Thread nickm
commit 410ce4cb49016b86a95056c8997d020c0c95d930 Merge: 1a7419c d5b2cbe Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:09:50 2015 -0400 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 changes/bug15088 |4 src/common/sandbox.c |1 + 2

[tor-commits] [tor/release-0.2.5] Add wait4 to the seccomp2 sandbox allowable syscall list

2015-03-09 Thread nickm
commit d5b2cbea106e020436d577e42672d281400558dd Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 4 12:18:10 2015 +0100 Add wait4 to the seccomp2 sandbox allowable syscall list fixes bug 15088. patch from sanic. --- changes/bug15088 |4 src/common/sandbox.c |

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5

2015-03-09 Thread nickm
commit c9dd2d1a6ad2684442abb7a31e29b0998aaf605c Merge: b08cfc6 9052874 Author: Nick Mathewson ni...@torproject.org Date: Mon Jan 12 00:59:29 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5 changes/bug14129 |7 +++ src/or/dns.c |6 +- 2

[tor-commits] [tor/release-0.2.5] Restore c89 in 0.2.5

2015-03-09 Thread nickm
commit 64bfc2930ac0be3af669636c16f6f0bba715056f Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:22:58 2015 -0400 Restore c89 in 0.2.5 --- src/or/control.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5

2015-03-09 Thread nickm
commit e3408248b9373e52114773555d73f71492e30129 Merge: 410ce4c 6830667 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:12:54 2015 -0400 Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 changes/bug13988 |3 +++ src/or/rephist.c |4 +--- 2 files

[tor-commits] [tor/release-0.2.5] Do not leave empty, invalid chunks in buffers during buf_pullup

2015-03-09 Thread nickm
commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch

[tor-commits] [tor/release-0.2.5] Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value

2015-03-09 Thread nickm
commit b08cfc65a78527cc97f4d0aeff3217d5f1c93e08 Author: teor teor2...@gmail.com Date: Sun Jan 11 19:33:04 2015 +1100 Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value Check for a missing option value in parse_virtual_addr_network before asserting on the

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5

2015-03-09 Thread nickm
commit 6d728ba8801031b27937436cbcad033f4406a8b5 Merge: 5b55778 47760c7 Author: Nick Mathewson ni...@torproject.org Date: Mon Dec 22 15:58:49 2014 -0500 Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5 src/common/crypto.c |6 ++ src/common/util.c |3 +++ 2

[tor-commits] [tor/release-0.2.5] Increase limit for status vote download size by a factor of 5.

2015-03-09 Thread nickm
commit ceb6dee4652567fd503e5ceb9345354efd935a1b Author: Nick Mathewson ni...@torproject.org Date: Sun Jan 18 15:25:29 2015 -0500 Increase limit for status vote download size by a factor of 5. We've started to hit the limit here. We introduced the limit in 0.1.2.5-alpha. This

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

2015-03-09 Thread nickm
commit 1525eeeb49a4666069371a8300d6fa1c22c04de3 Merge: 7cbdec5 8e61d38 Author: Nick Mathewson ni...@torproject.org Date: Fri Feb 20 01:04:26 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/ticket14487 |3 +++ src/or/config.c |2 +- 2 files

[tor-commits] [tor/release-0.2.5] When decoding a base-{16, 32, 64} value, clear the target buffer first

2015-03-09 Thread nickm
commit 47760c7ba5f1c87c945f4a018e3b3da6d127a8b9 Author: Nick Mathewson ni...@torproject.org Date: Mon Dec 22 12:56:35 2014 -0500 When decoding a base-{16,32,64} value, clear the target buffer first This is a good idea in case the caller stupidly doesn't check the return value

[tor-commits] [tor/release-0.2.5] Make the assert related to 15083 a tiny bit more tolerant

2015-03-09 Thread nickm
commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 |6 +- src/or/buffers.c |9 - 2 files changed, 13

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

2015-03-09 Thread nickm
commit 2bcb596dcf3dd5972de3875da3f1d9485115ce38 Merge: 8e61d38 9052874 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 24 13:23:44 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4 changes/bug14129 |7 +++ src/or/dns.c |6 +- 2

[tor-commits] [tor/release-0.2.5] Adjust changes header

2015-03-09 Thread nickm
commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index

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

2015-03-09 Thread nickm
commit 51e36026e5b04384bf3311354ef0cd5a5cbf2d59 Merge: 1525eee 2bcb596 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 24 13:24:57 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5

2015-03-09 Thread nickm
commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:17:20 2015 -0400 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 changes/bug14261 |5 + src/or/directory.c |9 -

[tor-commits] [tor/release-0.2.5] Increase bandwidth usage report interval to 4 hours.

2015-03-09 Thread nickm
commit 6830667d58815219476593901334b2e19554d8af Author: Nick Mathewson ni...@torproject.org Date: Mon Dec 22 12:24:13 2014 -0500 Increase bandwidth usage report interval to 4 hours. --- changes/bug13988 |3 +++ src/or/rephist.c |4 +--- 2 files changed, 4 insertions(+), 3

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-09 Thread nickm
commit e3b6373003da33a0a9e9817868abbaea65bd5cec Merge: 4af742f c066f2d Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:50:05 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/ticket14128 |5 - 1 file changed, 5 deletions(-)

[tor-commits] [tor/master] We actually merged this one a while ago.

2015-03-09 Thread nickm
commit c066f2d30b36f242867093ae33cd61a6ecd310f1 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:49:55 2015 -0400 We actually merged this one a while ago. --- changes/ticket14128 |5 - 1 file changed, 5 deletions(-) diff --git a/changes/ticket14128

  1   2   >