Merge branch 'maint-0.2.4' into release-0.2.4
commitef996c91b84e0eacb6773f1b63fb3837229c99ab
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:55:14 +0000 (9 14:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:55:14 +0000 (9 14:55 -0400)
tree8cbb9552b0fc673cfd0629c68a3c76c3839e264e
parent8e6174e38906105e32690c54936eef19e0946103
parent3c2d4611ce52024364bc729a97749651ac239e80
Merge branch 'maint-0.2.4' into release-0.2.4