]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d6f00e cd2121a)
Merge branch 'pr1854_squashed' into maint-0.4.3
authorteor <teor@torproject.org>
Thu, 9 Apr 2020 01:05:59 +0000 (11:05 +1000)
committerteor <teor@torproject.org>
Thu, 9 Apr 2020 01:05:59 +0000 (11:05 +1000)
Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).


Trivial merge
Mirror of https://git.torproject.org/tor.git