Merge branch 'maint-0.2.4' into release-0.2.4
commit8bcc14f62e620c4a15084449c335680096511001
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 15:39:48 +0000 (7 10:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 15:39:48 +0000 (7 10:39 -0500)
tree79ef0cfd806c443621d410ef91d3346e73dc4c53
parent9c5ff56659fc0636adfd9f1448cc0167f53e7eec
parent85a2487f9704cfeff0255c5f660d977ec9c30cff
Merge branch 'maint-0.2.4' into release-0.2.4