Merge branch 'maint-0.2.4' into release-0.2.4
commitbd440537169728a626c3d38c2ad14d800898f617
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:29:37 +0000 (7 09:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:29:37 +0000 (7 09:29 -0500)
tree495ee2f584f7da7f09ab1372922b40a0b6ac68d2
parent0e2f18868cc7634cf4ef8bc7823f61cd301497ba
parentea597832e25e776a45375d18a973e079ca32d424
Merge branch 'maint-0.2.4' into release-0.2.4