]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7efdf5c 971eba0)
Merge remote-tracking branch 'yawning/feature16535'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 19:27:41 +0000 (15:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 19:27:41 +0000 (15:27 -0400)

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