]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f18ee7f e0b7598)
Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Jun 2015 14:40:58 +0000 (10:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Jun 2015 14:40:58 +0000 (10:40 -0400)

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