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

2020-02-10 Thread nickm
commit 71c49f735636d626abaa13222aa14e7c97f73393 Merge: 7afb95d3e f3fa22bf1 Author: Nick Mathewson Date: Mon Feb 10 14:17:10 2020 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket33212 | 4 src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+)

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

2020-01-29 Thread teor
commit 6b392c333a854bb4d18ae6ea1686627451bb03f8 Merge: 9b0b2aef8 65825018c Author: teor Date: Thu Jan 30 07:55:05 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2 file

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

2020-01-15 Thread teor
commit fb541ffca31d4906642ffb3bbe6bb6079cfcb1c9 Merge: f5461a4bd 026f068bb Author: teor Date: Thu Jan 16 10:00:40 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/lib/evloop/compat_libevent.c

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

2019-12-19 Thread teor
commit 72376378714fef727004830157da79be97821a60 Merge: ffccf6fc5 d96b35d66 Author: teor Date: Fri Dec 20 10:12:43 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 10 -- changes/ticket32240 | 4 changes/ticket32242 | 2 ++ 3 files changed, 10 ins

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

2019-12-15 Thread teor
commit ffccf6fc55f691e01ccd3e756486415cbc7ffe8a Merge: 7174a80ed 748117298 Author: teor Date: Mon Dec 16 08:16:12 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 9 + changes/ticket32177 | 3 --- changes/ticket32629 | 4 3 files changed, 9 inserti

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

2019-12-09 Thread nickm
commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc Merge: 6513102b9 b9504f788 Author: Nick Mathewson Date: Mon Dec 9 16:02:07 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

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

2019-12-06 Thread nickm
commit 6513102b9d186793402e05ec3d37f077d01a0cc2 Merge: 8933c7908 c7ca3fc18 Author: Nick Mathewson Date: Fri Dec 6 16:02:08 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933 ++

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

2019-12-05 Thread nickm
commit db1065403ddabacd7c67273bff30f027151fb142 Merge: cfa9cc34a e66533bef Author: Nick Mathewson Date: Thu Dec 5 13:31:17 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 "ours" to avoid version bump. ___ tor-commits mailing li

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

2019-12-04 Thread teor
commit cfa9cc34aa36c0f300724a01998633efbe8439ea Merge: 14089a29b 92fb09906 Author: teor Date: Thu Dec 5 10:14:01 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31571| 7 +++ changes/bug31810| 4 src/lib/err/backtrace.c

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

2019-12-02 Thread teor
commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor Date: Tue Dec 3 12:46:50 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 insertions(+), 5 deletions(-

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

2019-11-24 Thread teor
commit 26071aa3be8f26d7e81384f1d40bb1d5fe94cca0 Merge: 29eb7b07e 055f5d4d1 Author: teor Date: Mon Nov 25 12:37:07 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug30344| 4 changes/bug31939| 3 +++ changes/bug32108|

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

2019-11-11 Thread nickm
commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 Merge: 7043be968 329aa1c48 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++--

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

2019-11-10 Thread teor
commit 7043be968a6ebe6fe56f139fc8db372aa9a7379a Merge: de6ceb0be 29940511e Author: teor Date: Mon Nov 11 14:19:47 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 2 +- changes/bug32449 | 5 + 2 files changed, 6 insertions(+), 1 deletion(-)

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

2019-11-05 Thread teor
commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Merge: 4f9a00339 03e77ef03 Author: teor Date: Wed Nov 6 11:19:46 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31408| 5 changes/bug31837| 5 src/lib/fs/conffile.c | 10 +--- src/test/tes

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

2019-10-28 Thread teor
commit 63aff4a43e0ed2b50632beb4e630f2504881538e Merge: 63581d55a 54e2d0dc2 Author: teor Date: Tue Oct 29 08:26:48 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 7 --- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) __

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

2019-10-24 Thread teor
commit 63581d55a691e56cde121194558db8a139ab9e74 Merge: 8bc65cda4 e56e7e865 Author: teor Date: Fri Oct 25 10:56:06 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml| 12 ++-- changes/ticket31919_bionic | 5 + 2 files changed, 15 insertions(+),

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

2019-10-22 Thread teor
commit 4a5c909ce5e91e916620de4b8dde28d42b4d4d8e Merge: 3c071f300 57acdaa3f Author: teor Date: Wed Oct 23 08:47:15 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml| 6 +++--- .travis.yml | 6 -- changes/ticket31372_appveyor | 4

[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.0' into maint-0.4.1

2019-10-22 Thread teor
commit 2318bb237fa9ce908efdb0cf89dbeaffe3871939 Merge: 53aa15963 9bb0ca122 Author: teor Date: Tue Oct 22 20:48:13 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 12 +++- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)

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

2019-10-21 Thread nickm
commit 53aa159632ea5138614e974a2709c378dfe53cde Merge: 400e31ad1 89ead08ee Author: Nick Mathewson Date: Mon Oct 21 18:44:44 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml | 8 changes/ticket32086 | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-

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

2019-10-16 Thread teor
commit 400e31ad1937aeaa962349eef058945080c46daa Merge: 13daf339a e483257e1 Author: teor Date: Thu Oct 17 14:52:06 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org https://list