]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.3.5' into maint-0.4.3 maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Wed, 3 Feb 2021 18:39:08 +0000 (13:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 3 Feb 2021 18:39:08 +0000 (13:39 -0500)
commit8a17999da3626a5f9e8922277151624cd0526fba
treeee3508f591bedf5eab5c4f3dada83ab269091a8b
parent0d14ac1e0e2434aaa0fade0224fdf2e4d384f4b5
parent21317c92296f0c08176c8788f8f2bcf501e78032
Merge branch 'maint-0.3.5' into maint-0.4.3

"ours" to avoid version bump.