commit c79957581e5d6c64fdae2be5b4d5a188ed18960a
Merge: d425dbf04a 9001732394
Author: Nick Mathewson
Date: Mon Nov 16 22:42:23 2020 -0500
Merge branch 'maint-0.4.4' into master
changes/bug40179_part1 | 4
src/test/hs_ntor_ref.py | 6 --
2 files changed, 8 insertions(+), 2
commit dde6b8906f9b26f594e24a4ebe75d38893a4fd76
Merge: 4806aa5da8 3f1544bbd9
Author: Nick Mathewson
Date: Thu Nov 12 08:13:26 2020 -0500
Merge branch 'maint-0.4.4' into master
"ours" to avoid version bump.
___
tor-commits mailing list
commit bc6c37b202e907ed721adbfe2c08977416c0e61c
Merge: 113d18dc57 494ced690d
Author: Nick Mathewson
Date: Mon Nov 9 17:14:01 2020 -0500
Merge branch 'maint-0.4.4' into master
"-s ours" to avoid version bump.
___
tor-commits mailing list
commit 113d18dc5770aac9a69bf360722eb25a8054202c
Merge: faa96f9a8e ec0f000445
Author: Nick Mathewson
Date: Mon Nov 9 16:17:50 2020 -0500
Merge branch 'maint-0.4.4' into master
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 438aba6c0b70c5becc8ba2c17fad98156901f64b
Merge: 84e825598a a914ac5d7c
Author: George Kadianakis
Date: Wed Oct 7 13:42:57 2020 +0300
Merge branch 'maint-0.4.4' into master
changes/bug40129 | 4
src/feature/dircache/dircache_stub.c | 2 ++
commit 84e825598a8845b34ac0dff2a6d797725c174b19
Merge: 5f61e19d8a 149b7a2418
Author: George Kadianakis
Date: Wed Oct 7 13:29:16 2020 +0300
Merge branch 'maint-0.4.4' into master
changes/bug40113 | 3 +++
src/test/test_connection.c | 13 +++--
2 files changed, 10
