]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ac24b5 8b5ad24)
Merge remote-tracking branch 'tor-github/pr/397'
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 14:01:26 +0000 (10:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 14:01:26 +0000 (10:01 -0400)

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