]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d85270e 00f5909)
Merge branch 'ticket13172'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Nov 2014 18:25:17 +0000 (13:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Nov 2014 18:25:17 +0000 (13:25 -0500)

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