Merge branch 'maint-0.2.4' into release-0.2.4
commitd7810bb4a35cc0d0359b26856e1adeaf5c2bfdf8
authorNick Mathewson <nickm@torproject.org>
Wed, 11 Jan 2017 14:11:44 +0000 (11 09:11 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 Jan 2017 14:11:44 +0000 (11 09:11 -0500)
treefa389c725ab8641f0cc22a3fd815ea5f197c582a
parent956c61ec23e8e4861f852473292c2c54abb7f614
parent3833f67dd2dc35dbcfe1d5659c885f0b5f54125b
Merge branch 'maint-0.2.4' into release-0.2.4