]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b51667 ac2f90e)
Merge remote-tracking branch 'teor/nickm-bug13401'
authorNick Mathewson <nickm@torproject.org>
Sun, 11 Jan 2015 16:10:23 +0000 (11:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 11 Jan 2015 16:10:23 +0000 (11:10 -0500)

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