Merge branch 'maint-0.2.4' into release-0.2.4
commit040d7cecf39c06ee705a97c90d546d34d6c115ab
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:40:00 +0000 (7 08:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:40:00 +0000 (7 08:40 -0500)
treeb3fec182b1a569b0b68181e023e0ee300b912506
parentd7810bb4a35cc0d0359b26856e1adeaf5c2bfdf8
parent51675f97d30e48da68f2cf538f7f805f51af4c36
Merge branch 'maint-0.2.4' into release-0.2.4