]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d34a1e 6f0edff)
Merge remote-tracking branch 'arthuredelstein/21873'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Apr 2017 15:57:14 +0000 (11:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Apr 2017 15:57:14 +0000 (11:57 -0400)

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