]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9092810 a883517)
Merge remote-tracking branch 'public/bug13796'
authorNick Mathewson <nickm@torproject.org>
Fri, 6 Feb 2015 03:53:15 +0000 (22:53 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 6 Feb 2015 03:53:15 +0000 (22:53 -0500)

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