Merge branch 'maint-0.2.4' into release-0.2.4
commit2afdf8de2f8a71e6a7de24546a03e505f4258aff
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:50:45 +0000 (15 07:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:50:45 +0000 (15 07:50 -0500)
tree847b55532a59d25f56470b6361817f2931cf36f7
parent92f8b56e27450f3646ea1b2a5751fce9e77beb86
parent194e31057fbf07d6bdf4b62d26e1a9db334e5f1c
Merge branch 'maint-0.2.4' into release-0.2.4