]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.3.5' into maint-0.4.4 maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Jun 2021 15:46:20 +0000 (11:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Jun 2021 15:46:20 +0000 (11:46 -0400)
commit253b83b72223f67024ea10b4008610dd18396811
tree901a1540561a81fc8baade6b3b8dd6128b65eb66
parent0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d
parent87492154e0a68ae369ea9fc40dcaa037e8f871a4
Merge branch 'maint-0.3.5' into maint-0.4.4

"ours" to avoid version bump.