Merge remote-tracking branch 'origin/maint-0.2.4'

Using "ours" strategy since we already merged the equivalent of #9866
into this branch.
This commit is contained in:
Nick Mathewson 2013-10-08 16:09:45 -04:00
commit 30b8fc3e0d

Diff Content Not Available