Merge branch 'maint-0.2.8' into maint-0.2.9
commit4858cda2df2222c61bb32269aea4f6978d6458fb
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Jul 2017 14:51:28 +0000 (7 10:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Jul 2017 14:51:28 +0000 (7 10:51 -0400)
tree16c5baac0ca39d8b86c9f90082c05dfc55f12805
parentdfc06148407a1610d515d45b344558850486bd98
parentc1e4aff384c483f64c66775011719267059f6915
Merge branch 'maint-0.2.8' into maint-0.2.9