Merge branch 'maint-0.2.8' into release-0.2.8
commit017245074e3a2c1c7ad4375911a586367e036b04
authorNick Mathewson <nickm@torproject.org>
Fri, 1 Jul 2016 13:54:01 +0000 (1 09:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 1 Jul 2016 13:54:01 +0000 (1 09:54 -0400)
treedc9c4e74368fd903c72b5e683cda9bd0c0da783d
parent34879d0a4b47815af413d169fbbde0162068bb00
parent744077dd155c347092002d2fa642ebdaca651608
Merge branch 'maint-0.2.8' into release-0.2.8