[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-02-07 Thread translation
commit 51bb2e8b81675e6e8c9dc8a58a39d85f47a12c66 Author: Translation commit bot Date: Tue Feb 7 11:18:22 2017 + Update translations for tor-browser-manual --- vi/vi.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vi/vi.po

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-02-07 Thread translation
commit ae614f112b88ce9be9fe4a59ee162015ad72d721 Author: Translation commit bot Date: Tue Feb 7 11:48:19 2017 + Update translations for tor-browser-manual --- vi/vi.po | 4 1 file changed, 4 insertions(+) diff --git a/vi/vi.po b/vi/vi.po index

[tor-commits] [tor/maint-0.2.4] Check for len < 4 in dn_indicates_v3_cert

2017-02-07 Thread nickm
commit 35bf07b8d67d018f7740ca195cf8c7c86b1b4ef9 Author: Nick Mathewson Date: Wed Oct 21 11:44:43 2015 -0400 Check for len < 4 in dn_indicates_v3_cert Without this check, we potentially look up to 3 characters before the start of a malloc'd segment, which

[tor-commits] [tor/maint-0.2.4] Refine the memwipe() arguments check for 18089 a little more.

2017-02-07 Thread nickm
commit 6cb8c0fd4e9c544710b1ad72a695feb87a1d7ee7 Author: Nick Mathewson Date: Tue Jan 19 08:28:58 2016 -0500 Refine the memwipe() arguments check for 18089 a little more. We still silently ignore memwipe(NULL, ch, 0); and memwipe(ptr, ch,

[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4

2017-02-07 Thread nickm
commit 51675f97d30e48da68f2cf538f7f805f51af4c36 Merge: 6cb8c0f 9459ae2 Author: Nick Mathewson Date: Tue Feb 7 08:37:07 2017 -0500 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4 changes/bug17404| 6 ++ src/common/tortls.c | 4 2

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

2017-02-07 Thread nickm
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

[tor-commits] [tor/maint-0.2.5] Make memwipe() do nothing when passed a NULL pointer or zero size

2017-02-07 Thread nickm
commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089.

[tor-commits] [tor/maint-0.2.6] Check for len < 4 in dn_indicates_v3_cert

2017-02-07 Thread nickm
commit 35bf07b8d67d018f7740ca195cf8c7c86b1b4ef9 Author: Nick Mathewson Date: Wed Oct 21 11:44:43 2015 -0400 Check for len < 4 in dn_indicates_v3_cert Without this check, we potentially look up to 3 characters before the start of a malloc'd segment, which

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

2017-02-07 Thread nickm
commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson Date: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

[tor-commits] [tor/maint-0.2.6] Refine the memwipe() arguments check for 18089 a little more.

2017-02-07 Thread nickm
commit 6cb8c0fd4e9c544710b1ad72a695feb87a1d7ee7 Author: Nick Mathewson Date: Tue Jan 19 08:28:58 2016 -0500 Refine the memwipe() arguments check for 18089 a little more. We still silently ignore memwipe(NULL, ch, 0); and memwipe(ptr, ch,

[tor-commits] [tor/maint-0.2.5] Refine the memwipe() arguments check for 18089 a little more.

2017-02-07 Thread nickm
commit 6cb8c0fd4e9c544710b1ad72a695feb87a1d7ee7 Author: Nick Mathewson Date: Tue Jan 19 08:28:58 2016 -0500 Refine the memwipe() arguments check for 18089 a little more. We still silently ignore memwipe(NULL, ch, 0); and memwipe(ptr, ch,

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

2017-02-07 Thread nickm
commit 05ec055c417c80bf7b13914fade70a72f11accc5 Merge: 332543b 51675f9 Author: Nick Mathewson Date: Tue Feb 7 08:38:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

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

2017-02-07 Thread nickm
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

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

2017-02-07 Thread nickm
commit 05ec055c417c80bf7b13914fade70a72f11accc5 Merge: 332543b 51675f9 Author: Nick Mathewson Date: Tue Feb 7 08:38:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

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

2017-02-07 Thread nickm
commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.7] Make memwipe() do nothing when passed a NULL pointer or zero size

2017-02-07 Thread nickm
commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089.

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

2017-02-07 Thread nickm
commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.7] Fix out-of-bounds read in INTRODUCE2 client auth

2017-02-07 Thread nickm
commit 053e11f397f3f890c52a1add6aa4e75a9178eba0 Author: John Brooks Date: Sat Apr 25 22:52:35 2015 -0600 Fix out-of-bounds read in INTRODUCE2 client auth The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized

[tor-commits] [tor/maint-0.2.6] Fix out-of-bounds read in INTRODUCE2 client auth

2017-02-07 Thread nickm
commit 053e11f397f3f890c52a1add6aa4e75a9178eba0 Author: John Brooks Date: Sat Apr 25 22:52:35 2015 -0600 Fix out-of-bounds read in INTRODUCE2 client auth The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized

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

2017-02-07 Thread nickm
commit 51675f97d30e48da68f2cf538f7f805f51af4c36 Merge: 6cb8c0f 9459ae2 Author: Nick Mathewson Date: Tue Feb 7 08:37:07 2017 -0500 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4 changes/bug17404| 6 ++ src/common/tortls.c | 4 2

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

2017-02-07 Thread nickm
commit da0d5ad9830b22983864660ca1c732627e119747 Merge: 54771bc 332543b Author: Nick Mathewson Date: Tue Feb 7 08:34:37 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.6] Fix the return value

2017-02-07 Thread nickm
commit 9459ae260e3ae428283c3b45d08aaef6ef9f6fa3 Author: Nick Mathewson Date: Wed Oct 21 12:01:05 2015 -0400 Fix the return value --- src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/tortls.c b/src/common/tortls.c

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

2017-02-07 Thread nickm
commit da0d5ad9830b22983864660ca1c732627e119747 Merge: 54771bc 332543b Author: Nick Mathewson Date: Tue Feb 7 08:34:37 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson Date: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

[tor-commits] [tor/maint-0.2.9] Fix out-of-bounds read in INTRODUCE2 client auth

2017-02-07 Thread nickm
commit 053e11f397f3f890c52a1add6aa4e75a9178eba0 Author: John Brooks Date: Sat Apr 25 22:52:35 2015 -0600 Fix out-of-bounds read in INTRODUCE2 client auth The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized

[tor-commits] [tor/master] Make memwipe() do nothing when passed a NULL pointer or zero size

2017-02-07 Thread nickm
commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089.

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

2017-02-07 Thread nickm
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

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

2017-02-07 Thread nickm
commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.9] Refine the memwipe() arguments check for 18089 a little more.

2017-02-07 Thread nickm
commit 6cb8c0fd4e9c544710b1ad72a695feb87a1d7ee7 Author: Nick Mathewson Date: Tue Jan 19 08:28:58 2016 -0500 Refine the memwipe() arguments check for 18089 a little more. We still silently ignore memwipe(NULL, ch, 0); and memwipe(ptr, ch,

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm
commit eb72365554451f5e129169bb1216a9610f7ff183 Merge: 8c91cbb 8936c50 Author: Nick Mathewson Date: Tue Feb 7 08:39:25 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson Date: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

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

2017-02-07 Thread nickm
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit 7b24f3e0fef04cdb21cd0b73ec4fde457702a81b Merge: c77ace6 eb72365 Author: Nick Mathewson Date: Tue Feb 7 08:39:33 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit 05ec055c417c80bf7b13914fade70a72f11accc5 Merge: 332543b 51675f9 Author: Nick Mathewson Date: Tue Feb 7 08:38:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit 7b24f3e0fef04cdb21cd0b73ec4fde457702a81b Merge: c77ace6 eb72365 Author: Nick Mathewson Date: Tue Feb 7 08:39:33 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

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

2017-02-07 Thread nickm
commit 51675f97d30e48da68f2cf538f7f805f51af4c36 Merge: 6cb8c0f 9459ae2 Author: Nick Mathewson Date: Tue Feb 7 08:37:07 2017 -0500 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4 changes/bug17404| 6 ++ src/common/tortls.c | 4 2

[tor-commits] [tor/release-0.2.6] Make memwipe() do nothing when passed a NULL pointer or zero size

2017-02-07 Thread nickm
commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089.

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

2017-02-07 Thread nickm
commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson Date: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

[tor-commits] [tor/release-0.2.6] Fix out-of-bounds read in INTRODUCE2 client auth

2017-02-07 Thread nickm
commit 053e11f397f3f890c52a1add6aa4e75a9178eba0 Author: John Brooks Date: Sat Apr 25 22:52:35 2015 -0600 Fix out-of-bounds read in INTRODUCE2 client auth The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized

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

2017-02-07 Thread nickm
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

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

2017-02-07 Thread nickm
commit da0d5ad9830b22983864660ca1c732627e119747 Merge: 54771bc 332543b Author: Nick Mathewson Date: Tue Feb 7 08:34:37 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit c4c5ee8cd4cb693623e922aaeb723f011784fd88 Merge: 54ec335 0f46f7d Author: Nick Mathewson Date: Tue Feb 7 08:39:48 2017 -0500 Merge branch 'maint-0.2.9' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2017-02-07 Thread nickm
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

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

2017-02-07 Thread nickm
commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit 05ec055c417c80bf7b13914fade70a72f11accc5 Merge: 332543b 51675f9 Author: Nick Mathewson Date: Tue Feb 7 08:38:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

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

2017-02-07 Thread nickm
commit db61ae2c84648db75c949f36d7dc2ee95fe7255b Merge: 50911dd 8936c50 Author: Nick Mathewson Date: Tue Feb 7 08:41:35 2017 -0500 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

[tor-commits] [tor/release-0.2.7] Make memwipe() do nothing when passed a NULL pointer or zero size

2017-02-07 Thread nickm
commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089.

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

2017-02-07 Thread nickm
commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson Date: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

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

2017-02-07 Thread nickm
commit c6f2ae514eb2713d386bedac2f7e71ed04385026 Merge: e6965f7 b9ef21c Author: Nick Mathewson Date: Tue Feb 7 09:18:54 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit b60fb3ab8b803b535a81296dbbf7d0c218a3dd27 Merge: 93ea18e 0a43134 Author: Nick Mathewson Date: Tue Feb 7 09:20:45 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit b9ef21cf565cab46571f965fc2d3f368c7e7a1da Merge: 6b37512 e4a4224 Author: Nick Mathewson Date: Tue Feb 7 09:17:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2

[tor-commits] [tor/release-0.2.7] Backport the tonga->bifroest move to 0.2.4.

2017-02-07 Thread nickm
commit e4a42242eaa2547adf0ad66ccc577f31817b86db Author: Nick Mathewson Date: Tue Feb 7 09:15:21 2017 -0500 Backport the tonga->bifroest move to 0.2.4. This is a backport of 19728 and 19690 --- changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files

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

2017-02-07 Thread nickm
commit 3e5b1c2d95d2270d2e7b9e137c5ec04e0e534659 Merge: 946661d b60fb3a Author: Nick Mathewson Date: Tue Feb 7 09:20:52 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit 535e03400419340c3bed2af5fa810308727293c5 Merge: 56451e8 c6f2ae5 Author: Nick Mathewson Date: Tue Feb 7 09:21:15 2017 -0500 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2

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

2017-02-07 Thread nickm
commit b60fb3ab8b803b535a81296dbbf7d0c218a3dd27 Merge: 93ea18e 0a43134 Author: Nick Mathewson Date: Tue Feb 7 09:20:45 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.8] Backport the tonga->bifroest move to 0.2.4.

2017-02-07 Thread nickm
commit e4a42242eaa2547adf0ad66ccc577f31817b86db Author: Nick Mathewson Date: Tue Feb 7 09:15:21 2017 -0500 Backport the tonga->bifroest move to 0.2.4. This is a backport of 19728 and 19690 --- changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files

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

2017-02-07 Thread nickm
commit 632d006897043d01db06ad72034a62cf34911ef4 Merge: 618fafd 0a43134 Author: Nick Mathewson Date: Tue Feb 7 09:21:17 2017 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 ___ tor-commits mailing list

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

2017-02-07 Thread nickm
commit c6f2ae514eb2713d386bedac2f7e71ed04385026 Merge: e6965f7 b9ef21c Author: Nick Mathewson Date: Tue Feb 7 09:18:54 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2

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

2017-02-07 Thread nickm
commit b9ef21cf565cab46571f965fc2d3f368c7e7a1da Merge: 6b37512 e4a4224 Author: Nick Mathewson Date: Tue Feb 7 09:17:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2

[tor-commits] [tor/release-0.2.5] Backport the tonga->bifroest move to 0.2.4.

2017-02-07 Thread nickm
commit e4a42242eaa2547adf0ad66ccc577f31817b86db Author: Nick Mathewson Date: Tue Feb 7 09:15:21 2017 -0500 Backport the tonga->bifroest move to 0.2.4. This is a backport of 19728 and 19690 --- changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files

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

2017-02-07 Thread nickm
commit 0a43134009a431ecd734a4c122d5de0d63529800 Merge: 115cefd c6f2ae5 Author: Nick Mathewson Date: Tue Feb 7 09:20:13 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 This is an "ours" merge to avoid conflicts on the authority list: the 0.2.7

[tor-commits] [tor/maint-0.2.9] Changes file for 21357: Stop rejecting all IPv6 traffic on some Exits

2017-02-07 Thread nickm
commit bed94a9ed9974d7ecd93078604baed14e548d531 Author: teor Date: Wed Feb 1 16:39:21 2017 +1100 Changes file for 21357: Stop rejecting all IPv6 traffic on some Exits This issue was triggered by 17027 in 0.2.8.1-alpha, which rejects a relay's own IPv6

[tor-commits] [tor/maint-0.2.9] Refactor policy_summary_reject to prepare for IPv6 changes

2017-02-07 Thread nickm
commit 82850d0da6c29fe50e2622f0cde0142ca9530ae4 Author: teor Date: Wed Feb 1 15:18:47 2017 +1100 Refactor policy_summary_reject to prepare for IPv6 changes No behaviour change, apart from non-fatal assertions Part of 21357 --- src/or/policies.c | 15

[tor-commits] [tor/release-0.2.9] Changes file for 21357: Stop rejecting all IPv6 traffic on some Exits

2017-02-07 Thread nickm
commit bed94a9ed9974d7ecd93078604baed14e548d531 Author: teor Date: Wed Feb 1 16:39:21 2017 +1100 Changes file for 21357: Stop rejecting all IPv6 traffic on some Exits This issue was triggered by 17027 in 0.2.8.1-alpha, which rejects a relay's own IPv6

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

2017-02-07 Thread nickm
commit e210015d2f464464c8f06931eff09a0b4ff5bd6b Merge: 64b0ee2 9379984 Author: Nick Mathewson Date: Tue Feb 7 09:24:29 2017 -0500 Merge branch 'maint-0.2.9' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.2.9] Fix write_short_policy usage comment

2017-02-07 Thread nickm
commit e95b8f7df9faf61dea8f523da7548a7217aa831a Author: teor Date: Wed Feb 1 13:48:09 2017 +1100 Fix write_short_policy usage comment --- src/or/policies.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index

[tor-commits] [tor/master] Merge branch 'teor_bug21357-v2_029' into maint-0.2.9

2017-02-07 Thread nickm
commit 9379984128365487d732a89a851a1132b8edbfa0 Merge: dff390d bed94a9 Author: Nick Mathewson Date: Tue Feb 7 09:24:08 2017 -0500 Merge branch 'teor_bug21357-v2_029' into maint-0.2.9 changes/bug21357 | 7 + src/or/policies.c | 95 +++--

[tor-commits] [tor/release-0.2.9] Fix IPv6 support in policy_summary_reject and policy_summary_accept

2017-02-07 Thread nickm
commit 4667a40ca944134866b95b10407a7e471206aa00 Author: teor Date: Wed Feb 1 15:28:46 2017 +1100 Fix IPv6 support in policy_summary_reject and policy_summary_accept This interim fix results in too many IPv6 rejections. No behaviour change for IPv4

[tor-commits] [tor/release-0.2.9] Refactor policy_summary_reject to prepare for IPv6 changes

2017-02-07 Thread nickm
commit 82850d0da6c29fe50e2622f0cde0142ca9530ae4 Author: teor Date: Wed Feb 1 15:18:47 2017 +1100 Refactor policy_summary_reject to prepare for IPv6 changes No behaviour change, apart from non-fatal assertions Part of 21357 --- src/or/policies.c | 15

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

2017-02-07 Thread nickm
commit e66c30e47c02c0243aba1935a06e95188210e84d Merge: 343a694 9379984 Author: Nick Mathewson Date: Tue Feb 7 09:24:23 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug21357 | 7 + src/or/policies.c | 95 +++-- src/or/policies.h

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

2017-02-07 Thread nickm
commit 51dc284088dc5f6f513bf8db23b0d820ebf5575b Merge: e210015 a271ad2 Author: Nick Mathewson Date: Tue Feb 7 09:27:22 2017 -0500 Merge branch 'maint-0.2.9' changes/bug21280 | 5 + 1 file changed, 5 insertions(+)

[tor-commits] [tor/master] (this already went in to 0.3.0.3-alpha)

2017-02-07 Thread nickm
commit ea2f08ac7f0f9501c7fd8d4c63e01baa4983eca7 Author: Nick Mathewson Date: Tue Feb 7 09:27:37 2017 -0500 (this already went in to 0.3.0.3-alpha) --- changes/bug21280 | 5 - 1 file changed, 5 deletions(-) diff --git a/changes/bug21280 b/changes/bug21280 deleted

[tor-commits] [tor/release-0.2.9] Do not truncate too long hostnames

2017-02-07 Thread nickm
commit c4920a60c6af935cc347fe3436dd7ff62a9e380d Author: junglefowl Date: Tue Jan 24 18:40:01 2017 + Do not truncate too long hostnames If a hostname is supplied to tor-resolve which is too long, it will be silently truncated, resulting in a different

[tor-commits] [tor/maint-0.2.9] changes file for 21280

2017-02-07 Thread nickm
commit a271ad2a7efed53c42bc84b0f781a6603bd494fc Author: Nick Mathewson Date: Wed Jan 25 13:15:37 2017 -0500 changes file for 21280 --- changes/bug21280 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug21280 b/changes/bug21280 new file mode 100644

[tor-commits] [tor/maint-0.2.7] Revert "Add hidserv-stats filname to our sandbox filter"

2017-02-07 Thread nickm
commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6.

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit a9f936d0d757c5628a8da0b88af4710b2f6d22fd Merge: b60fb3a 86d5a6f Author: Nick Mathewson Date: Tue Feb 7 09:30:10 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.9] Revert "Add hidserv-stats filname to our sandbox filter"

2017-02-07 Thread nickm
commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6.

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm
commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334 Merge: 0a43134 5446cb8 Author: Nick Mathewson Date: Tue Feb 7 09:29:27 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.

[tor-commits] [tor/maint-0.2.6] Revert "Add hidserv-stats filname to our sandbox filter"

2017-02-07 Thread nickm
commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6.

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm
commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334 Merge: 0a43134 5446cb8 Author: Nick Mathewson Date: Tue Feb 7 09:29:27 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm
commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334 Merge: 0a43134 5446cb8 Author: Nick Mathewson Date: Tue Feb 7 09:29:27 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-02-07 Thread nickm
commit 65cda78ec6037da8059526d1c23449013f921ed2 Merge: a271ad2 a9f936d Author: Nick Mathewson Date: Tue Feb 7 09:30:19 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8

2017-02-07 Thread nickm
commit a9f936d0d757c5628a8da0b88af4710b2f6d22fd Merge: b60fb3a 86d5a6f Author: Nick Mathewson Date: Tue Feb 7 09:30:10 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list

[tor-commits] [tor/release-0.2.6] Revert "Add hidserv-stats filname to our sandbox filter"

2017-02-07 Thread nickm
commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6.

[tor-commits] [tor/master] Revert "Add hidserv-stats filname to our sandbox filter"

2017-02-07 Thread nickm
commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6.

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm
commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334 Merge: 0a43134 5446cb8 Author: Nick Mathewson Date: Tue Feb 7 09:29:27 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.

[tor-commits] [tor/maint-0.2.8] Revert "Add hidserv-stats filname to our sandbox filter"

2017-02-07 Thread nickm
commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6.

[tor-commits] [tor/release-0.2.7] Revert "Add hidserv-stats filname to our sandbox filter"

2017-02-07 Thread nickm
commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661 Author: Nick Mathewson Date: Tue Feb 7 09:28:50 2017 -0500 Revert "Add hidserv-stats filname to our sandbox filter" Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6.

[tor-commits] [tor/maint-0.2.4] Fix out-of-bounds read in INTRODUCE2 client auth

2017-02-07 Thread nickm
commit 053e11f397f3f890c52a1add6aa4e75a9178eba0 Author: John Brooks Date: Sat Apr 25 22:52:35 2015 -0600 Fix out-of-bounds read in INTRODUCE2 client auth The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized

[tor-commits] [tor/maint-0.2.6] Make memwipe() do nothing when passed a NULL pointer or zero size

2017-02-07 Thread nickm
commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089.

[tor-commits] [tor/maint-0.2.4] Fix the return value

2017-02-07 Thread nickm
commit 9459ae260e3ae428283c3b45d08aaef6ef9f6fa3 Author: Nick Mathewson Date: Wed Oct 21 12:01:05 2015 -0400 Fix the return value --- src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/tortls.c b/src/common/tortls.c

[tor-commits] [tor/maint-0.2.5] Fix the return value

2017-02-07 Thread nickm
commit 9459ae260e3ae428283c3b45d08aaef6ef9f6fa3 Author: Nick Mathewson Date: Wed Oct 21 12:01:05 2015 -0400 Fix the return value --- src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/tortls.c b/src/common/tortls.c

[tor-commits] [tor/maint-0.2.4] Make memwipe() do nothing when passed a NULL pointer or zero size

2017-02-07 Thread nickm
commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089.

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

2017-02-07 Thread nickm
commit 51675f97d30e48da68f2cf538f7f805f51af4c36 Merge: 6cb8c0f 9459ae2 Author: Nick Mathewson Date: Tue Feb 7 08:37:07 2017 -0500 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4 changes/bug17404| 6 ++ src/common/tortls.c | 4 2

[tor-commits] [tor/maint-0.2.5] Fix out-of-bounds read in INTRODUCE2 client auth

2017-02-07 Thread nickm
commit 053e11f397f3f890c52a1add6aa4e75a9178eba0 Author: John Brooks Date: Sat Apr 25 22:52:35 2015 -0600 Fix out-of-bounds read in INTRODUCE2 client auth The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized

[tor-commits] [tor/maint-0.2.5] Check for len < 4 in dn_indicates_v3_cert

2017-02-07 Thread nickm
commit 35bf07b8d67d018f7740ca195cf8c7c86b1b4ef9 Author: Nick Mathewson Date: Wed Oct 21 11:44:43 2015 -0400 Check for len < 4 in dn_indicates_v3_cert Without this check, we potentially look up to 3 characters before the start of a malloc'd segment, which

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

2017-02-07 Thread nickm
commit da0d5ad9830b22983864660ca1c732627e119747 Merge: 54771bc 332543b Author: Nick Mathewson Date: Tue Feb 7 08:34:37 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing list

[tor-commits] [tor/master] Refine the memwipe() arguments check for 18089 a little more.

2017-02-07 Thread nickm
commit 6cb8c0fd4e9c544710b1ad72a695feb87a1d7ee7 Author: Nick Mathewson Date: Tue Jan 19 08:28:58 2016 -0500 Refine the memwipe() arguments check for 18089 a little more. We still silently ignore memwipe(NULL, ch, 0); and memwipe(ptr, ch,

  1   2   3   4   5   >