]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 574344b 2025490)
Merge remote-tracking branch 'public/bug16286'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Aug 2015 16:44:13 +0000 (12:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Aug 2015 16:44:13 +0000 (12:44 -0400)

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