]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48bf3ae 9879eae)
Merge remote-tracking branch 'tor-github/pr/1690/head'
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2020 13:45:25 +0000 (08:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2020 13:45:25 +0000 (08:45 -0500)

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