[tor-commits] [tor/master] Merge branch 'tor-github/pr/1940'

2020-06-29 Thread ahf
commit 96876d3ad79c14722cf14d9705df291b38ec4a82 Merge: 86aa84e63 caebfa5f6 Author: Alexander Færøy Date: Tue Jun 30 01:22:44 2020 + Merge branch 'tor-github/pr/1940' src/test/test_hs_service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Fix typo in test_build_update_descriptors() comment

2020-06-29 Thread ahf
commit caebfa5f6feb7451959b613d656c177ed1288a7d Author: Neel Chauhan Date: Wed Jun 17 20:12:13 2020 -0700 Fix typo in test_build_update_descriptors() comment --- src/test/test_hs_service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_hs_service.c

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-06-29 Thread translation
commit e0c14d1d75126cd6a92e4ad5d175bb69905130f8 Author: Translation commit bot Date: Mon Jun 29 19:16:19 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-06-29 Thread translation
commit 6abdf1f504db0fe88996805a0a5ad8a6f7674d0c Author: Translation commit bot Date: Mon Jun 29 19:15:41 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index

[tor-commits] [translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed

2020-06-29 Thread translation
commit cb1c56f1452d2fc82c44650a81556c3938c0d49a Author: Translation commit bot Date: Mon Jun 29 19:15:43 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2020-06-29 Thread translation
commit 2e078163df8cd59fa3b2ba77da8bbb3ef05723eb Author: Translation commit bot Date: Mon Jun 29 18:15:11 2020 + https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot --- contents+fr.po | 16 1 file changed, 12 insertions(+), 4 deletions(-)

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

2020-06-29 Thread nickm
commit 76e04a83267de91cda21253a268ea131d52ac679 Merge: 1850ac469 feddba6f8 Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Wipe the entire hashent structure, not just the first sizeof(void*)

2020-06-29 Thread nickm
commit c1649ab01522f6258fc2555869cbf3abb7535515 Author: Nick Mathewson Date: Fri Feb 14 08:15:37 2020 -0500 Wipe the entire hashent structure, not just the first sizeof(void*) --- src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/maint-0.4.3] Merge branch 'ticket33290_v2_042' into maint-0.4.2

2020-06-29 Thread nickm
commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/maint-0.4.2] Wipe the entire hashent structure, not just the first sizeof(void*)

2020-06-29 Thread nickm
commit c1649ab01522f6258fc2555869cbf3abb7535515 Author: Nick Mathewson Date: Fri Feb 14 08:15:37 2020 -0500 Wipe the entire hashent structure, not just the first sizeof(void*) --- src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/maint-0.4.2] Use more memory poisoning and better asserts around ewma code

2020-06-29 Thread nickm
commit 80e3dc47272c9ba423d40ce367fb99d39c3150ec Author: Nick Mathewson Date: Wed Feb 12 14:17:19 2020 -0500 Use more memory poisoning and better asserts around ewma code Attempt to diagnose 32464; fixes 33290. --- changes/ticket33290 | 4 src/core/or/circuitmux.c

[tor-commits] [tor/maint-0.4.4] Merge branch 'ticket33290_v2_042' into maint-0.4.2

2020-06-29 Thread nickm
commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

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

2020-06-29 Thread nickm
commit 86aa84e634e05de44937f6fb0c593e441ad455b6 Merge: 5b47a58d1 feddba6f8 Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit fc4e1697fd44f0cf1db6d8a2ac2f4ad3159cffd3 Merge: 8a721e520 eef77227e Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Use more memory poisoning and better asserts around ewma code

2020-06-29 Thread nickm
commit 80e3dc47272c9ba423d40ce367fb99d39c3150ec Author: Nick Mathewson Date: Wed Feb 12 14:17:19 2020 -0500 Use more memory poisoning and better asserts around ewma code Attempt to diagnose 32464; fixes 33290. --- changes/ticket33290 | 4 src/core/or/circuitmux.c

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

2020-06-29 Thread nickm
commit fd1686c7d8df8d8159fcaab1c59dfabe154afd88 Merge: ff5220536 fff1054d1 Author: Nick Mathewson Date: Thu Feb 13 09:12:48 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/maint-0.4.2] Before freeing ewma objects, use memwipe instead of resetting magic.

2020-06-29 Thread nickm
commit fff1054d17c8e869c38d4ca1c68ed74a7e82e393 Author: Nick Mathewson Date: Thu Feb 13 09:11:35 2020 -0500 Before freeing ewma objects, use memwipe instead of resetting magic. --- src/core/or/circuitmux_ewma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/release-0.4.4] Merge branch 'ticket33290_v2_042' into maint-0.4.2

2020-06-29 Thread nickm
commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

2020-06-29 Thread nickm
commit 393bbd823ec32f8fb3636391945e6c6663ff1408 Merge: fd1686c7d c1649ab01 Author: Nick Mathewson Date: Fri Feb 14 08:16:01 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2020-06-29 Thread nickm
commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit ec2bc07f420ea3c76222583f2275941818b99257 Merge: 5668287fe d235e523d Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/release-0.4.2] Before freeing ewma objects, use memwipe instead of resetting magic.

2020-06-29 Thread nickm
commit fff1054d17c8e869c38d4ca1c68ed74a7e82e393 Author: Nick Mathewson Date: Thu Feb 13 09:11:35 2020 -0500 Before freeing ewma objects, use memwipe instead of resetting magic. --- src/core/or/circuitmux_ewma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

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

2020-06-29 Thread nickm
commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/release-0.4.3] Merge branch 'ticket33290_v2_042' into maint-0.4.2

2020-06-29 Thread nickm
commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/maint-0.4.2] Merge branch 'ticket33290_v2_042' into maint-0.4.2

2020-06-29 Thread nickm
commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/maint-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

2020-06-29 Thread nickm
commit 393bbd823ec32f8fb3636391945e6c6663ff1408 Merge: fd1686c7d c1649ab01 Author: Nick Mathewson Date: Fri Feb 14 08:16:01 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

2020-06-29 Thread nickm
commit fd1686c7d8df8d8159fcaab1c59dfabe154afd88 Merge: ff5220536 fff1054d1 Author: Nick Mathewson Date: Thu Feb 13 09:12:48 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/master] Merge branch 'ticket33290_v2_042' into maint-0.4.2

2020-06-29 Thread nickm
commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 src/core/or/circuitmux.c | 8 ++--

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

2020-06-29 Thread nickm
commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 src/feature/control/control.c

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

2020-06-29 Thread nickm
commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

2020-06-29 Thread nickm
commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 src/feature/control/control.c

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

2020-06-29 Thread nickm
commit b2ce815bd8ddcde2ea49b0020b3feda83d88444f Merge: 9e85515f8 d124cfc05 Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 1850ac46973541c3d30ecd7a42faa7f5be573a4a Merge: d5257ad06 b2ce815bd Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 5668287fe74122c61eaa2178a97737d671109655 Merge: 64b8ee3f9 a692b87f8 Author: Nick Mathewson Date: Mon Jun 29 13:53:39 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug33104 | 4 src/feature/control/control.c| 4

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.4] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

2020-06-29 Thread nickm
commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 src/feature/control/control.c

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit b2ce815bd8ddcde2ea49b0020b3feda83d88444f Merge: 9e85515f8 d124cfc05 Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 8a721e5208b1e6665e1add8f4e776d0ff749369e Merge: 6a98e5f0d d124cfc05 Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Rewrite control_event_signal() to use signal_table.

2020-06-29 Thread nickm
commit 7bd671811ec38e8126ffc17cb922f2397c572cda Author: Nick Mathewson Date: Thu Jan 30 09:29:07 2020 -0500 Rewrite control_event_signal() to use signal_table. When we added the ACTIVE and DORMANT virtual signals, we taught the signal command to handle them, but we didn't

[tor-commits] [tor/release-0.4.2] Add tests for control_event_signal.

2020-06-29 Thread nickm
commit b2c3cb1b26c41969776ed1fd1b20588430346e45 Author: Nick Mathewson Date: Mon Feb 10 11:38:36 2020 -0500 Add tests for control_event_signal. --- src/test/test_controller_events.c | 39 +++ 1 file changed, 39 insertions(+) diff --git

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit b2ce815bd8ddcde2ea49b0020b3feda83d88444f Merge: 9e85515f8 d124cfc05 Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

2020-06-29 Thread nickm
commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 src/feature/control/control.c

[tor-commits] [tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

2020-06-29 Thread nickm
commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 src/feature/control/control.c

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

2020-06-29 Thread nickm
commit 5b47a58d1697462b83299d1ab0b7192e9dae6e35 Merge: def7844c4 b2ce815bd Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

2020-06-29 Thread nickm
commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 src/feature/control/control.c

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

2020-06-29 Thread nickm
commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 src/feature/control/control.c

[tor-commits] [tor/maint-0.4.2] Rewrite control_event_signal() to use signal_table.

2020-06-29 Thread nickm
commit 7bd671811ec38e8126ffc17cb922f2397c572cda Author: Nick Mathewson Date: Thu Jan 30 09:29:07 2020 -0500 Rewrite control_event_signal() to use signal_table. When we added the ACTIVE and DORMANT virtual signals, we taught the signal command to handle them, but we didn't

[tor-commits] [tor/maint-0.4.2] Add tests for control_event_signal.

2020-06-29 Thread nickm
commit b2c3cb1b26c41969776ed1fd1b20588430346e45 Author: Nick Mathewson Date: Mon Feb 10 11:38:36 2020 -0500 Add tests for control_event_signal. --- src/test/test_controller_events.c | 39 +++ 1 file changed, 39 insertions(+) diff --git

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

2020-06-29 Thread nickm
commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.4] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed,

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

2020-06-29 Thread nickm
commit d5257ad06948992f2d6e4c8b1ae16eb0abede0b6 Merge: d3983d3cd 9e85515f8 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 9e85515f8335428242f0f1751de1e03077fb0133 Merge: 6fb31bb34 31bdfd492 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 6a98e5f0d1945ea9a8924fdcfa66bc63cb3c6768 Merge: 140057360 31bdfd492 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Do not set "once" when calling tor_bug_occurred_ from BUG().

2020-06-29 Thread nickm
commit 2a1f8ea2e78486966c71762ebc3286f2b3e531ff Author: Nick Mathewson Date: Thu Jan 30 09:43:34 2020 -0500 Do not set "once" when calling tor_bug_occurred_ from BUG(). The "once" flag makes tor_bug_occurred_() say that future instances of the warning will be suppressed -- but

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit 9e85515f8335428242f0f1751de1e03077fb0133 Merge: 6fb31bb34 31bdfd492 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed,

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

2020-06-29 Thread nickm
commit 64b8ee3f9e0f2c70444f2aee0acf1433a791d82d Merge: 57390b76b 0575a182a Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed, 6 insertions(+), 1

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed,

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed,

[tor-commits] [tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed,

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit 9e85515f8335428242f0f1751de1e03077fb0133 Merge: 6fb31bb34 31bdfd492 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.2] Do not set "once" when calling tor_bug_occurred_ from BUG().

2020-06-29 Thread nickm
commit 2a1f8ea2e78486966c71762ebc3286f2b3e531ff Author: Nick Mathewson Date: Thu Jan 30 09:43:34 2020 -0500 Do not set "once" when calling tor_bug_occurred_ from BUG(). The "once" flag makes tor_bug_occurred_() say that future instances of the warning will be suppressed -- but

[tor-commits] [tor/maint-0.4.4] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 + src/lib/log/util_bug.h | 2 +- 2 files changed,

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

2020-06-29 Thread nickm
commit def7844c4f636c51bed5d79f922a974521f68553 Merge: 6b71cc64c 9e85515f8 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson Date: Mon Jun 29 12:58:23 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31

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

2020-06-29 Thread nickm
commit f862971d04149e1b62bc7cd058c4b72a4d07eacd Merge: 3008255ae 216456299 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] err/log: Stop closing stderr and stdout during shutdown

2020-06-29 Thread nickm
commit c8242e4c0ae838121ed00d5a38cf0dae052e9d13 Author: teor Date: Wed Feb 12 12:47:15 2020 +1000 err/log: Stop closing stderr and stdout during shutdown Closing these file descriptors can hide sanitiser logs. Fixes bug 33087; bugfix on 0.4.1.6. --- changes/bug33087

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

2020-06-29 Thread nickm
commit 6b71cc64cfb9570694ed94d43274308b5c5137af Merge: ea3a25ff5 6fb31bb34 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.4' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 6fb31bb34a92d35d1c74af976a46bace4fcccf35 Merge: 41a424390 f862971d0 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.4] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson Date: Mon Jun 29 12:58:23 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit f862971d04149e1b62bc7cd058c4b72a4d07eacd Merge: 3008255ae 216456299 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit d3983d3cdf04c9ef90839264359737017071de06 Merge: ec91a4a66 6fb31bb34 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson Date: Mon Jun 29 12:58:23 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31

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

2020-06-29 Thread nickm
commit 1400573601a9aa0773d87da8b0913167a566a567 Merge: 388210ceb f862971d0 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 57390b76bf0a4dea8254f53df734cb1427ed3006 Merge: 51b4a4bd1 216456299 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31 ++-

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson Date: Mon Jun 29 12:58:23 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit 6fb31bb34a92d35d1c74af976a46bace4fcccf35 Merge: 41a424390 f862971d0 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-06-29 Thread nickm
commit 6fb31bb34a92d35d1c74af976a46bace4fcccf35 Merge: 41a424390 f862971d0 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit f862971d04149e1b62bc7cd058c4b72a4d07eacd Merge: 3008255ae 216456299 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit f862971d04149e1b62bc7cd058c4b72a4d07eacd Merge: 3008255ae 216456299 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-06-29 Thread nickm
commit f862971d04149e1b62bc7cd058c4b72a4d07eacd Merge: 3008255ae 216456299 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.2] err/log: Stop closing stderr and stdout during shutdown

2020-06-29 Thread nickm
commit c8242e4c0ae838121ed00d5a38cf0dae052e9d13 Author: teor Date: Wed Feb 12 12:47:15 2020 +1000 err/log: Stop closing stderr and stdout during shutdown Closing these file descriptors can hide sanitiser logs. Fixes bug 33087; bugfix on 0.4.1.6. --- changes/bug33087

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson Date: Mon Jun 29 12:58:23 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31

[tor-commits] [tor/maint-0.4.4] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson Date: Mon Jun 29 12:58:23 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31

[tor-commits] [tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

2020-06-29 Thread nickm
commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson Date: Mon Jun 29 12:58:23 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 changes/bug33087 | 4 src/lib/err/torerr.c | 31

  1   2   3   >