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

2020-02-10 Thread nickm
commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2 Merge: 65825018c 2b6df3da2 Author: Nick Mathewson Date: Mon Feb 10 14:17:09 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket33212 | 4 src/rust/protover/protover.rs | 2 +- 2 files changed, 5

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

2020-01-29 Thread teor
commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

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

2020-01-15 Thread teor
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4

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

2019-12-15 Thread teor
commit 748117298341de8a279f4437b6d557f0d50edb63 Merge: b9504f788 1cd20ff84 Author: teor Date: Mon Dec 16 08:16:04 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 9 + changes/ticket32177 | 3 --- changes/ticket32629 | 4 3 files changed, 9

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

2019-12-09 Thread nickm
commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8 Merge: c7ca3fc18 0c4f0ec97 Author: Nick Mathewson Date: Mon Dec 9 16:01:22 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump. ___ tor-commits mailing

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

2019-12-06 Thread nickm
commit c7ca3fc1869f4999845526d7fd883e17630143e9 Merge: e66533bef 74cae547e Author: Nick Mathewson Date: Fri Dec 6 16:02:07 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933

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

2019-12-05 Thread nickm
commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e Merge: 92fb09906 c53567c36 Author: Nick Mathewson Date: Thu Dec 5 13:30:32 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump. ___ tor-commits mailing

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

2019-12-04 Thread teor
commit 92fb0990675424cd04eb0b39b4ae157ac7f5385b Merge: 46057ec5a aee966cb0 Author: teor Date: Thu Dec 5 10:13:53 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31571| 7 +++ src/lib/err/backtrace.c | 42 +++---

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

2019-12-02 Thread teor
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5

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

2019-11-24 Thread teor
commit 055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd Merge: c17ab20ac 501b5174d Author: teor Date: Mon Nov 25 12:36:59 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30344 | 4 changes/bug31939 | 3 +++ changes/ticket28970| 6

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

2019-11-11 Thread nickm
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751

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

2019-11-10 Thread teor
commit 29940511e3c431a2c62a3844c6b12a039eaed521 Merge: 03e77ef03 2abff832d Author: teor Date: Mon Nov 11 14:19:39 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 2 +- changes/bug32449 | 5 + 2 files changed, 6 insertions(+), 1 deletion(-)

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

2019-11-05 Thread teor
commit 03e77ef036e41486b8bfe138d11790c928f49f35 Merge: 54e2d0dc2 1bde356bf Author: teor Date: Wed Nov 6 11:19:38 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30916 | 4 +++ changes/bug31107 | 4 +++ changes/bug31408 | 5

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

2019-10-28 Thread teor
commit 54e2d0dc2d790a9e84ec44db2d53d535d8076602 Merge: e56e7e865 15d67842f Author: teor Date: Tue Oct 29 08:26:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 7 --- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

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

2019-10-24 Thread teor
commit e56e7e865e148c5017ae20df12c76df0f79e60c1 Merge: 57acdaa3f e03db9934 Author: teor Date: Fri Oct 25 10:55:58 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml| 12 ++-- changes/ticket31919_bionic | 5 + 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 teor
commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 Merge: 641f13044 d175e7081 Author: teor Date: Wed Oct 23 08:47:08 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug12399 | 3 +++ changes/bug23507 | 5 + changes/bug23818_v2| 6

[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/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-10-22 Thread teor
commit 9bb0ca122f13255982566b440b0b9d03b6a9e44b Merge: 89ead08ee bed439013 Author: teor Date: Tue Oct 22 20:48:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 12 +++- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)

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

2019-10-21 Thread nickm
commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc Merge: e483257e1 f420b60c1 Author: Nick Mathewson Date: Mon Oct 21 18:44:44 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml | 8 changes/ticket32086 | 3 +++ 2 files changed, 7 insertions(+), 4

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

2019-10-16 Thread teor
commit e483257e1bc826b5678fcbf13084fd5d811f2b12 Merge: a74c18069 4b8e5ea0d Author: teor Date: Thu Oct 17 14:51:58 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 87 +++-- changes/ticket30860 | 3 ++