]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cb028b 112c984)
Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Aug 2014 21:40:13 +0000 (17:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Aug 2014 21:40:13 +0000 (17:40 -0400)

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