Merge branch 'maint-0.2.8' into release-0.2.8
commit34879d0a4b47815af413d169fbbde0162068bb00
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Jun 2016 23:15:32 +0000 (28 19:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Jun 2016 23:15:32 +0000 (28 19:15 -0400)
tree6dd82f73c8df790cadb3de8e9447b0a5bbdc37e9
parent87ea2b6655d43ab95becf681e26a2092db17161e
parent2c9354fc1087c8b0bbfa7273106195e74540c731
Merge branch 'maint-0.2.8' into release-0.2.8