]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Sun, 25 Aug 2013 04:33:10 +0000 (00:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 25 Aug 2013 04:33:10 +0000 (00:33 -0400)
commita5610cfa64189db693dbad3efaa973d6720c42fe
tree656f97e37c332fc5baa4ef96d482d8b3529743c9
parent4107ddd003c6c0f1271ad73a40114350f600dbec
parent8611195a005ed1624bdea0632404a8c00bb19586
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

(Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own into 0.2.4)