]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8cb556 8acf525)
Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Thu, 18 Jun 2015 15:30:01 +0000 (11:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 18 Jun 2015 15:30:01 +0000 (11:30 -0400)

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