]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 545e211 35699ef)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Wed, 30 Apr 2014 01:08:26 +0000 (21:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 30 Apr 2014 01:08:26 +0000 (21:08 -0400)
Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is
a cherry-picked backport of 9686.


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