Merge branch 'maint-0.2.4' into release-0.2.4
commit9c5ff56659fc0636adfd9f1448cc0167f53e7eec
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 14:21:10 +0000 (7 09:21 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 14:21:10 +0000 (7 09:21 -0500)
tree6255fab6d87f81e97010353ea8fd23dca6e519d0
parenta2192a671c9038026696f079184c4358fb70d443
parente4a42242eaa2547adf0ad66ccc577f31817b86db
Merge branch 'maint-0.2.4' into release-0.2.4