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
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
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
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
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
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
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
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
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
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
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|
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
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(-)
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 +---
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(-)
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(+),
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
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(+)
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(-)
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
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
commit 4dcbbe4166192beae321001e820bd3c15a8f2512
Merge: 6f3f93d86 a74c18069
Author: Nick Mathewson
Date: Wed Oct 2 08:01:34 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/geoip-2019-10-01 | 4 +
src/config/geoip | 35299
commit 5f00c03ed0327917409b074b99b7509c26128617
Merge: c3e94a8cc 9e674d0eb
Author: Nick Mathewson
Date: Tue Sep 17 21:28:38 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/bug31657| 5 +
src/feature/client/entrynodes.c | 3 ++-
commit c3e94a8ccdea60d460d0095821c1743c0f815367
Merge: a3342b382 a1f97bb25
Author: Nick Mathewson
Date: Tue Sep 17 21:26:32 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/doc31089| 4 +
contrib/operator-tools/tor-exit-notice.html | 177
commit 50f981719f1bc7066496bcc4ef78fcdbb1ff1806
Merge: cec42be57 ef3543558
Author: Nick Mathewson
Date: Tue Sep 17 18:58:44 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/ticket31673 | 3 +++
src/lib/meminfo/meminfo.c | 7 ---
2 files changed, 7 insertions(+), 3
commit cec42be570fcbbfbc5971e0ceba21e8eadd32d21
Merge: ab74c3560 34bab120d
Author: Nick Mathewson
Date: Tue Sep 17 18:56:52 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/ticket31687_1 | 4
changes/ticket31687_2 | 5 +
commit 4596ead2fc88e4b1482b0f3bc8ff356daea2337b
Merge: 9dd908e71 896a1ac50
Author: teor
Date: Thu Sep 5 14:48:02 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 9dd908e7138ecc4c26c7db2f1c1be4776499237d
Merge: c08d3e46c 1203e137b
Author: teor
Date: Thu Sep 5 12:05:12 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 25e7fc5b7a84c926f3acebd385e97d2679097bd6
Merge: ff905f8e1 a52a5e009
Author: teor
Date: Fri Aug 30 23:33:10 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 5a73f369dbd4d19ced536f4862b12ef98d6a2002
Merge: 7c92f4faa 357e9a6f2
Author: George Kadianakis
Date: Tue Aug 27 11:49:36 2019 +0300
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
commit bba64c9882ffabfdd5cc75554bef222e7eb1e25a
Merge: 6eb5a811d 90f4ed233
Author: Nick Mathewson
Date: Mon Aug 19 10:37:21 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/ticket31406 | 3 +++
src/app/config/auth_dirs.inc | 2 +-
2 files changed, 4 insertions(+),
commit 6eb5a811d732f59d5cd203c966d09ac820421642
Merge: fc89397fa 20943d00f
Author: teor
Date: Mon Aug 12 13:10:14 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit fc89397fa9db3230c41004ba315ad1724540e46b
Merge: fb19d13f2 bad001080
Author: teor
Date: Sat Aug 10 07:26:30 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 40d7f1e3a67cf44e50e009c313baf686e6b2
Merge: 6d0883e9e 0a661cde1
Author: teor
Date: Thu Aug 8 11:19:58 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
.travis.yml | 8 +---
changes/ticket30591 | 3 +++
changes/ticket30694 | 3 +++
3 files changed, 11
commit 6d0883e9e932a9557a2c2ed0c358a6bf91b99c4e
Merge: 21531f35f e27a74b1b
Author: teor
Date: Thu Aug 8 11:11:35 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 5e1660100027e742c39c073c84add64e093f7745
Merge: 3ccf91027 2a42d6be2
Author: Nick Mathewson
Date: Mon Jul 1 14:25:12 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/ticket28795 | 5 +
src/app/config/fallback_dirs.inc | 567
commit ce89fe36c8d5e6210a2418430c91c3df03d86bdc
Merge: 29842f68e afa2c39ba
Author: Nick Mathewson
Date: Tue Jun 11 10:17:18 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
changes/geoip-2019-06-10 | 4 +
src/config/geoip | 14985
commit 2779ce1f6fbcb9a80284246593758e5fce71d718
Merge: 5b07ff401 4ca18fde9
Author: teor
Date: Tue Jun 11 14:52:36 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 5b07ff40112390518d95caa90447cd5faf938cf7
Merge: 6a72cc259 c8447f95e
Author: Nick Mathewson
Date: Mon Jun 10 18:44:31 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
.travis.yml | 4
changes/bug30744 | 3 +++
2 files changed, 7 insertions(+)
commit 6a72cc25983850fb23bd21adb181b38c0ead2c5a
Merge: c0285320d 430dd2da6
Author: Nick Mathewson
Date: Mon Jun 10 18:33:26 2019 -0400
Merge branch 'maint-0.4.0' into maint-0.4.1
.travis.yml | 2 ++
changes/bug30713| 5 +
src/test/test_rebind.py | 7 +++
40 matches
Mail list logo
