Merge branch 'maint-0.2.4' into maint-0.2.5
commit304d8f3bbbf063c2ee504568dde134296a2025ca
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2016 13:58:54 +0000 (6 09:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2016 13:58:54 +0000 (6 09:58 -0400)
tree2a2321e3bc06419be8909d07b6b09eb0589b6871
parente4d82da05b11a78da4858050b6d1e8d922842ca3
parent1b4984f196848cd404456fd1251e0352b9abf05e
Merge branch 'maint-0.2.4' into maint-0.2.5