]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61029d6 db2c2a6)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 31 Oct 2013 18:08:57 +0000 (14:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 31 Oct 2013 18:08:57 +0000 (14:08 -0400)
Do an "ours" merge to not take the 0.2.4 fix for #9731


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