Merge branch 'maint-0.2.4' into maint-0.2.5
commite8e89fd7a180ec54a8bdc4de09b69a4dc8f38f7d
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:10:21 +0000 (7 10:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:10:21 +0000 (7 10:10 -0500)
tree121b198b3f4687c068fd5053768de8635a784430
parent3569cffe1441e2e8c754feffcdc229e9a2680d0d
parentdbb919cf9400738987bbb91166b7b30c4cf770e9
Merge branch 'maint-0.2.4' into maint-0.2.5