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

2019-10-22 Thread nickm
commit 9769df89fe5bd8ccd802064273cca09efddc2b02 Merge: c1bf4260b ebce7059f Author: Nick Mathewson Date: Tue Oct 22 12:15:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1 changes/bug31594| 5 +++ src/lib/err/backtrace.c | 2 +-

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1

2019-10-22 Thread nickm
commit 9769df89fe5bd8ccd802064273cca09efddc2b02 Merge: c1bf4260b ebce7059f Author: Nick Mathewson Date: Tue Oct 22 12:15:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1 changes/bug31594| 5 +++ src/lib/err/backtrace.c | 2 +-

[tor-commits] [tor/release-0.4.1] backtrace: Add a missing check for HAVE_PTHREAD_H before using mutexes

2019-10-22 Thread nickm
commit ab7bfdf40402449d6a2214e1dd5bc3fe5bc9a2e7 Author: teor Date: Mon Sep 9 11:21:15 2019 +1000 backtrace: Add a missing check for HAVE_PTHREAD_H before using mutexes Fixes bug 31614; bugfix on 0.2.5.2-alpha. --- src/lib/err/backtrace.c | 3 ++- 1 file changed, 2 insertions(+),

[tor-commits] [tor/release-0.4.1] log: explain why it is safe to leave the log mutex initialized

2019-10-22 Thread nickm
commit 749c2e1761c753992fb2549e7ee912e568f563d6 Author: teor Date: Thu Sep 26 12:18:23 2019 +1000 log: explain why it is safe to leave the log mutex initialized The log mutex is dynamically initialized, guarded by log_mutex_initialized. We don't want to destroy it, because

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

2019-10-22 Thread nickm
commit 9537966a0bd080ccc80b91c7b88c53009753239e Merge: c55c75bc9 9769df89f Author: Nick Mathewson Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1

2019-10-22 Thread nickm
commit 9769df89fe5bd8ccd802064273cca09efddc2b02 Merge: c1bf4260b ebce7059f Author: Nick Mathewson Date: Tue Oct 22 12:15:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1 changes/bug31594| 5 +++ src/lib/err/backtrace.c | 2 +-

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1

2019-10-22 Thread nickm
commit c1bf4260b69fa4de09471e31994b7fa242dce872 Merge: d4dde249a 749c2e176 Author: Nick Mathewson Date: Tue Oct 22 12:13:47 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1 changes/bug31614 | 9 + src/lib/err/backtrace.c | 26

[tor-commits] [tor/maint-0.4.1] sandbox: Allow backtrace signals to be disabled

2019-10-22 Thread nickm
commit 2f8a9a2db692a101b7e6241cbcdf9ed87841310b Author: teor Date: Tue Sep 24 13:51:38 2019 +1000 sandbox: Allow backtrace signals to be disabled Part of 31614. --- src/lib/sandbox/sandbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/sandbox/sandbox.c

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

2019-10-22 Thread nickm
commit c1bf4260b69fa4de09471e31994b7fa242dce872 Merge: d4dde249a 749c2e176 Author: Nick Mathewson Date: Tue Oct 22 12:13:47 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1 changes/bug31614 | 9 + src/lib/err/backtrace.c | 26

[tor-commits] [tor/release-0.4.1] changes: file for 31614

2019-10-22 Thread nickm
commit c9c046c365f10f5cbffada921931413edc690dbe Author: teor Date: Thu Sep 26 12:09:56 2019 +1000 changes: file for 31614 --- changes/bug31614 | 9 + 1 file changed, 9 insertions(+) diff --git a/changes/bug31614 b/changes/bug31614 new file mode 100644 index 0..c425a9fcd

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

2019-10-22 Thread nickm
commit 34f3d8d407d67a617aef54ac78326c1c1e34936b Merge: e5b9eefb0 d4dde249a Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] torerr: Close sigsafe fds on shutdown

2019-10-22 Thread nickm
commit d02ced4cafaed5b11079585f03f47e73034dd980 Author: teor Date: Wed Sep 4 14:54:08 2019 +1000 torerr: Close sigsafe fds on shutdown And clear the list of error fds. Part of 31594. --- src/lib/err/torerr.c | 42 --

[tor-commits] [tor/release-0.4.1] lock: Avoid some undefined behaviour when freeing mutexes.

2019-10-22 Thread nickm
commit d1eab05834566f998721d3a16107767885711c57 Author: teor Date: Fri Sep 20 11:27:05 2019 +1000 lock: Avoid some undefined behaviour when freeing mutexes. Fixes bug 31736; bugfix on 0.0.7. --- changes/bug31736 | 3 +++ src/app/config/config.c

[tor-commits] [tor/release-0.4.1] sandbox: Allow backtrace signals to be disabled

2019-10-22 Thread nickm
commit 2f8a9a2db692a101b7e6241cbcdf9ed87841310b Author: teor Date: Tue Sep 24 13:51:38 2019 +1000 sandbox: Allow backtrace signals to be disabled Part of 31614. --- src/lib/sandbox/sandbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/sandbox/sandbox.c

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

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

2019-10-22 Thread nickm
commit 6f3ee65f5340b47ebb6e215e5cc1dbd6e013778b Merge: 11b1e1715 34f3d8d40 Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

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

2019-10-22 Thread nickm
commit da59dee5d4d791ad46d3b3d69bcd880c1a5335bb Merge: 8d7015eb8 e5b9eefb0 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread nickm
commit 34f3d8d407d67a617aef54ac78326c1c1e34936b Merge: e5b9eefb0 d4dde249a Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1

2019-10-22 Thread nickm
commit c1bf4260b69fa4de09471e31994b7fa242dce872 Merge: d4dde249a 749c2e176 Author: Nick Mathewson Date: Tue Oct 22 12:13:47 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1 changes/bug31614 | 9 + src/lib/err/backtrace.c | 26

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1

2019-10-22 Thread nickm
commit d4dde249a04c768381767f67a1a82425bc70baaa Merge: 6965798a1 d1eab0583 Author: Nick Mathewson Date: Tue Oct 22 12:11:50 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1 changes/bug31736 | 3 +++ src/app/config/config.c

[tor-commits] [tor/release-0.3.5] Appveyor: Avoid spurious errors in Appveyor CI builds

2019-10-22 Thread nickm
commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884;

[tor-commits] [tor/maint-0.4.1] backtrace: Add a missing check for HAVE_PTHREAD_H before using mutexes

2019-10-22 Thread nickm
commit ab7bfdf40402449d6a2214e1dd5bc3fe5bc9a2e7 Author: teor Date: Mon Sep 9 11:21:15 2019 +1000 backtrace: Add a missing check for HAVE_PTHREAD_H before using mutexes Fixes bug 31614; bugfix on 0.2.5.2-alpha. --- src/lib/err/backtrace.c | 3 ++- 1 file changed, 2 insertions(+),

[tor-commits] [tor/release-0.4.1] backtrace: Disable signal handlers in remove_bt_handler()

2019-10-22 Thread nickm
commit 6b97a5a843341b5ea2a9039bdd5290d524a44cd4 Author: teor Date: Wed Sep 4 14:50:09 2019 +1000 backtrace: Disable signal handlers in remove_bt_handler() Fixes bug 31614; bugfix on 0.2.5.2-alpha. --- src/lib/err/backtrace.c | 19 +-- 1 file changed, 17

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

2019-10-22 Thread nickm
commit 34f3d8d407d67a617aef54ac78326c1c1e34936b Merge: e5b9eefb0 d4dde249a Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread nickm
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit 8bef3a76a917c879b0d675961953af0bbf5378cd Merge: da1d900d3 6965798a1 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/maint-0.4.1] changes: file for 31614

2019-10-22 Thread nickm
commit c9c046c365f10f5cbffada921931413edc690dbe Author: teor Date: Thu Sep 26 12:09:56 2019 +1000 changes: file for 31614 --- changes/bug31614 | 9 + 1 file changed, 9 insertions(+) diff --git a/changes/bug31614 b/changes/bug31614 new file mode 100644 index 0..c425a9fcd

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

2019-10-22 Thread nickm
commit f58439ee55512d8deb29272b0beadad43036c7fe Merge: 3939bb82f c55c75bc9 Author: Nick Mathewson Date: Tue Oct 22 12:13:56 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] backtrace: avoid undefined behaviour on re-initialisation

2019-10-22 Thread nickm
commit 315f14c709d019c55731faedb19a97b771f9c42f Author: teor Date: Fri Sep 20 11:40:05 2019 +1000 backtrace: avoid undefined behaviour on re-initialisation cb_buf_mutex is statically initialised, so we can not destroy it when we are shutting down the err subsystem. If we

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

2019-10-22 Thread nickm
commit c55c75bc9747b8c0d9763c4f5cb248b65836c615 Merge: 34f3d8d40 c1bf4260b Author: Nick Mathewson Date: Tue Oct 22 12:13:55 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] log: explain why it is safe to leave the log mutex initialized

2019-10-22 Thread nickm
commit 749c2e1761c753992fb2549e7ee912e568f563d6 Author: teor Date: Thu Sep 26 12:18:23 2019 +1000 log: explain why it is safe to leave the log mutex initialized The log mutex is dynamically initialized, guarded by log_mutex_initialized. We don't want to destroy it, because

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

2019-10-22 Thread nickm
commit c55c75bc9747b8c0d9763c4f5cb248b65836c615 Merge: 34f3d8d40 c1bf4260b Author: Nick Mathewson Date: Tue Oct 22 12:13:55 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread nickm
commit c1bf4260b69fa4de09471e31994b7fa242dce872 Merge: d4dde249a 749c2e176 Author: Nick Mathewson Date: Tue Oct 22 12:13:47 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1 changes/bug31614 | 9 + src/lib/err/backtrace.c | 26

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-10-22 Thread nickm
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

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

2019-10-22 Thread nickm
commit 6965798a160e7caa07899216f35d9d6641ed Merge: 4c8af10f0 4013e50cb Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit e5b9eefb02ddd951d3b959ebb5d2ca72ea65a9a9 Merge: cbc67241d 6965798a1 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread nickm
commit 3939bb82f0f222550385dd583355f57e7ec6f9ea Merge: da59dee5d 34f3d8d40 Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] lock: Avoid some undefined behaviour when freeing mutexes.

2019-10-22 Thread nickm
commit d1eab05834566f998721d3a16107767885711c57 Author: teor Date: Fri Sep 20 11:27:05 2019 +1000 lock: Avoid some undefined behaviour when freeing mutexes. Fixes bug 31736; bugfix on 0.0.7. --- changes/bug31736 | 3 +++ src/app/config/config.c

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

2019-10-22 Thread nickm
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/maint-0.4.1] backtrace: Disable signal handlers in remove_bt_handler()

2019-10-22 Thread nickm
commit 6b97a5a843341b5ea2a9039bdd5290d524a44cd4 Author: teor Date: Wed Sep 4 14:50:09 2019 +1000 backtrace: Disable signal handlers in remove_bt_handler() Fixes bug 31614; bugfix on 0.2.5.2-alpha. --- src/lib/err/backtrace.c | 19 +-- 1 file changed, 17

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

2019-10-22 Thread nickm
commit 2da3e3f70922fb3855deaf4e995b5eb857deb5e5 Merge: af3ab180b 4013e50cb Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit e5b9eefb02ddd951d3b959ebb5d2ca72ea65a9a9 Merge: cbc67241d 6965798a1 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread nickm
commit d4dde249a04c768381767f67a1a82425bc70baaa Merge: 6965798a1 d1eab0583 Author: Nick Mathewson Date: Tue Oct 22 12:11:50 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1 changes/bug31736 | 3 +++ src/app/config/config.c

[tor-commits] [tor/release-0.4.1] Appveyor: Avoid spurious errors in Appveyor CI builds

2019-10-22 Thread nickm
commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884;

[tor-commits] [tor/release-0.4.0] Appveyor: Avoid spurious errors in Appveyor CI builds

2019-10-22 Thread nickm
commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884;

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

2019-10-22 Thread nickm
commit 11b1e1715e3af3c39a4e32e3256acf137638849a Merge: 25a9eab04 e5b9eefb0 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-10-22 Thread nickm
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

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

2019-10-22 Thread nickm
commit 6965798a160e7caa07899216f35d9d6641ed Merge: 4c8af10f0 4013e50cb Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit 3209b4f77a7dfc3f218baab31b90c1c9d791c580 Merge: e3012d5e3 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-22 Thread nickm
commit 6965798a160e7caa07899216f35d9d6641ed Merge: 4c8af10f0 4013e50cb Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit 6965798a160e7caa07899216f35d9d6641ed Merge: 4c8af10f0 4013e50cb Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-10-22 Thread nickm
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/maint-0.4.1] Appveyor: Avoid spurious errors in Appveyor CI builds

2019-10-22 Thread nickm
commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884;

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

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

2019-10-22 Thread nickm
commit e5b9eefb02ddd951d3b959ebb5d2ca72ea65a9a9 Merge: cbc67241d 6965798a1 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-10-22 Thread nickm
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

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

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-10-22 Thread nickm
commit 6965798a160e7caa07899216f35d9d6641ed Merge: 4c8af10f0 4013e50cb Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

2019-10-22 Thread nickm
commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15

[tor-commits] [tor/maint-0.3.5] Appveyor: Avoid spurious errors in Appveyor CI builds

2019-10-22 Thread nickm
commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884;

[tor-commits] [tor/maint-0.4.0] Appveyor: Avoid spurious errors in Appveyor CI builds

2019-10-22 Thread nickm
commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884;

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1

2019-10-22 Thread nickm
commit 4c8af10f0ea1a7f634806e6870d4c93b947ecb13 Merge: 2318bb237 2b825a1a2 Author: Nick Mathewson Date: Tue Oct 22 12:08:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 changes/bug31898| 4 src/lib/dispatch/.may_include | 1 +

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

2019-10-22 Thread nickm
commit cbc67241dbe79d57eb1708b504b18f0cf12aeef1 Merge: f98b59524 4c8af10f0 Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.1] Add a test for max_u16_in_sl().

2019-10-22 Thread nickm
commit 34bbdaf5d4673491216b64f5ab983518b3f8c7d1 Author: Nick Mathewson Date: Tue Oct 1 12:52:13 2019 -0400 Add a test for max_u16_in_sl(). This test does not currently pass, because of bug 31898. --- src/test/test_dispatch.c | 29 + 1 file changed, 29

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

2019-10-22 Thread nickm
commit 4c8af10f0ea1a7f634806e6870d4c93b947ecb13 Merge: 2318bb237 2b825a1a2 Author: Nick Mathewson Date: Tue Oct 22 12:08:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 changes/bug31898| 4 src/lib/dispatch/.may_include | 1 +

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1

2019-10-22 Thread nickm
commit 4c8af10f0ea1a7f634806e6870d4c93b947ecb13 Merge: 2318bb237 2b825a1a2 Author: Nick Mathewson Date: Tue Oct 22 12:08:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 changes/bug31898| 4 src/lib/dispatch/.may_include | 1 +

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1

2019-10-22 Thread nickm
commit 4c8af10f0ea1a7f634806e6870d4c93b947ecb13 Merge: 2318bb237 2b825a1a2 Author: Nick Mathewson Date: Tue Oct 22 12:08:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 changes/bug31898| 4 src/lib/dispatch/.may_include | 1 +

[tor-commits] [tor/maint-0.4.1] Fix a crash bug in max_u16_in_sl()

2019-10-22 Thread nickm
commit 2b825a1a2e6e79fa71b0e038241d2107aaf30d4b Author: Nick Mathewson Date: Tue Oct 1 12:55:42 2019 -0400 Fix a crash bug in max_u16_in_sl() The documentation for this function says that the smartlist can contain NULLs, but the code only handled NULLs if they were at the

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

2019-10-22 Thread nickm
commit 25a9eab04c0a58072e7c306da4c4cb108f12afae Merge: 05f91b5d7 cbc67241d Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread nickm
commit 4c8af10f0ea1a7f634806e6870d4c93b947ecb13 Merge: 2318bb237 2b825a1a2 Author: Nick Mathewson Date: Tue Oct 22 12:08:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 changes/bug31898| 4 src/lib/dispatch/.may_include | 1 +

[tor-commits] [tor/release-0.4.1] Add a test for max_u16_in_sl().

2019-10-22 Thread nickm
commit 34bbdaf5d4673491216b64f5ab983518b3f8c7d1 Author: Nick Mathewson Date: Tue Oct 1 12:52:13 2019 -0400 Add a test for max_u16_in_sl(). This test does not currently pass, because of bug 31898. --- src/test/test_dispatch.c | 29 + 1 file changed, 29

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

2019-10-22 Thread nickm
commit da1d900d3003e4db86b57b0ea747aa058545d438 Merge: a2f666aa2 4c8af10f0 Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31898| 4 src/lib/dispatch/.may_include | 1 +

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

2019-10-22 Thread nickm
commit cbc67241dbe79d57eb1708b504b18f0cf12aeef1 Merge: f98b59524 4c8af10f0 Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.1] Fix a crash bug in max_u16_in_sl()

2019-10-22 Thread nickm
commit 2b825a1a2e6e79fa71b0e038241d2107aaf30d4b Author: Nick Mathewson Date: Tue Oct 1 12:55:42 2019 -0400 Fix a crash bug in max_u16_in_sl() The documentation for this function says that the smartlist can contain NULLs, but the code only handled NULLs if they were at the

[tor-commits] [tor/release-0.4.1] Rename max_in_sl to max_in_u16_sl, and expose it as STATIC.

2019-10-22 Thread nickm
commit f17591b8e504af9e088bd9df900639c83f5300fe Author: Nick Mathewson Date: Tue Oct 1 12:42:26 2019 -0400 Rename max_in_sl to max_in_u16_sl, and expose it as STATIC. Since we want to make this function slightly more visible for testing purposes, it needs a better name. ---

[tor-commits] [tor/maint-0.4.1] Rename max_in_sl to max_in_u16_sl, and expose it as STATIC.

2019-10-22 Thread nickm
commit f17591b8e504af9e088bd9df900639c83f5300fe Author: Nick Mathewson Date: Tue Oct 1 12:42:26 2019 -0400 Rename max_in_sl to max_in_u16_sl, and expose it as STATIC. Since we want to make this function slightly more visible for testing purposes, it needs a better name. ---

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

2019-10-22 Thread nickm
commit cbc67241dbe79d57eb1708b504b18f0cf12aeef1 Merge: f98b59524 4c8af10f0 Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-10-22 Thread nickm
commit 8d7015eb8b9087006fb627d31071caa21a654d49 Merge: 2d013bbe5 cbc67241d Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.2] Hand-edits to the 0.4.2.3-alpha changelog.

2019-10-22 Thread nickm
commit 05f91b5d742b1d32467604e2390e898028d0a2fe Author: Nick Mathewson Date: Tue Oct 22 12:06:37 2019 -0400 Hand-edits to the 0.4.2.3-alpha changelog. --- ChangeLog | 68 +-- 1 file changed, 36 insertions(+), 32 deletions(-)

[tor-commits] [tor/release-0.4.2] Run format_changelog.

2019-10-22 Thread nickm
commit fd7f987f30288cbdd8583a99cd3e70c91009f5e0 Author: Nick Mathewson Date: Tue Oct 22 11:56:01 2019 -0400 Run format_changelog. --- ChangeLog | 102 -- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/ChangeLog

[tor-commits] [tor/release-0.4.2] Start an 0.4.2.3-alpha changelog.

2019-10-22 Thread nickm
commit 7ce2432e19ef5b6ce1527c8e9d9e5c54c5cd897c Author: Nick Mathewson Date: Tue Oct 22 11:55:34 2019 -0400 Start an 0.4.2.3-alpha changelog. --- ChangeLog | 99 + changes/bug30344| 4 --- changes/bug31652| 5 ---

[tor-commits] [tor/release-0.4.2] Light sorting on 0.4.2.3-alpha changelog.

2019-10-22 Thread nickm
commit 9b3c31b250764c847b9b48469f3628dcb711b740 Author: Nick Mathewson Date: Tue Oct 22 11:58:18 2019 -0400 Light sorting on 0.4.2.3-alpha changelog. --- ChangeLog | 56 +++- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git

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

2019-10-22 Thread translation
commit 0ce30ac30647626594c0d84189716d014bbe3b4e Author: Translation commit bot Date: Tue Oct 22 15:46:48 2019 + https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot --- code_of_conduct+ru.po | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)

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

2019-10-22 Thread translation
commit 5ded16f458ee6a6c3aa1e1b761fac51a506f8663 Author: Translation commit bot Date: Tue Oct 22 15:23:00 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 46 ++ 1 file changed, 22 insertions(+), 24

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

2019-10-22 Thread translation
commit f1fb6eb068c12d9dd04ecb89951863a91be0f3ab Author: Translation commit bot Date: Tue Oct 22 15:19:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+nl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

2019-10-22 Thread translation
commit 99c5ec3a5e292c822c4e685f9bc43829a28d7ae6 Author: Translation commit bot Date: Tue Oct 22 15:15:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- fr/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

2019-10-22 Thread translation
commit bd42ccdade4c676b845a89ca9ed8c5c85f45c631 Author: Translation commit bot Date: Tue Oct 22 15:15:21 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 90 +- 1 file

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

2019-10-22 Thread translation
commit 2bdcea8fd9baac9489371c7221bff7d9f122b11d Author: Translation commit bot Date: Tue Oct 22 14:52:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 77 +- 1 file changed, 38

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

2019-10-22 Thread translation
commit 96a5dafb5f6a4a18e158e98d2e08f2b59697ecc3 Author: Translation commit bot Date: Tue Oct 22 14:45:22 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- mk/LC_MESSAGES/bridgedb.po | 90 +- 1 file

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

2019-10-22 Thread translation
commit b898e94b08874c32d6b1a0ba85dbae3183f9d74b Author: Translation commit bot Date: Tue Oct 22 14:45:15 2019 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- mk/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

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

2019-10-22 Thread translation
commit 8a3b6e94da993b36ef527399b5322d2826277298 Author: Translation commit bot Date: Tue Oct 22 14:23:20 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 38 +++--- 1 file changed, 19 insertions(+), 19

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

2019-10-22 Thread translation
commit fdfa08abfb991984866af6517b447ec7d349c3f2 Author: Translation commit bot Date: Tue Oct 22 13:53:32 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git

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

2019-10-22 Thread translation
commit 7fd5bf4f8197505a2030ed7a850775a8c830ddd1 Author: Translation commit bot Date: Tue Oct 22 13:23:23 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1417'

2019-10-22 Thread nickm
commit 2d013bbe5cccaccf9ace0beec5a987fb80e850ad Merge: a1d534137 8162859ef Author: Nick Mathewson Date: Tue Oct 22 08:36:32 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1417' changes/31147| 3 +++ src/feature/control/control_events.c | 5 -

<    1   2   3   4   5   6   >