Merge branch 'maint-0.2.8' into release-0.2.8
commit9d199893feabefc6fcc6849f939ec5cd4d8891b8
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 14:21:04 +0000 (25 10:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 14:21:04 +0000 (25 10:21 -0400)
treed99e98181bc56043a76dc7319883e22e61e5a8a5
parentb5e2b3844ab3a1c9fe42d0c83e3e95705dee2900
parent6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d
Merge branch 'maint-0.2.8' into release-0.2.8