Merge branch 'maint-0.2.7' into maint-0.2.8
commit2639fd08e7212bb33c0964b57028c013ce2271aa
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:31:36 +0000 (7 09:31 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:31:36 +0000 (7 09:31 -0500)
treefaaea3d3afaa99e3571855621e6c20ef3593633c
parent61bdc452b098acf681466204e51d49199067ff33
parentf5fdf188b9c2e218e89f55e4fb26fcd3b2abe44b
Merge branch 'maint-0.2.7' into maint-0.2.8