]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5927ed8 9b9fb63)
Merge remote-tracking branch 'public/ticket20002'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Sep 2016 18:27:13 +0000 (14:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Sep 2016 18:27:13 +0000 (14:27 -0400)

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