]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01e2aae 14bc6e8)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 1 May 2014 15:45:38 +0000 (11:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 May 2014 15:45:38 +0000 (11:45 -0400)
(this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that
commit downgrades the bug 7164 warning in versions <= 0.2.4 because it
isn't as useful as the one 0.2.5 has)


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