]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2088b3b 9deb3c6)
Merge branch 'bug16539'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Aug 2015 17:35:53 +0000 (13:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Aug 2015 17:35:53 +0000 (13:35 -0400)

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