]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a08bcf 8596ccc)
Merge remote-tracking branch 'public/feature_16580'
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Jul 2015 19:48:41 +0000 (15:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Jul 2015 19:48:41 +0000 (15:48 -0400)

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