Merge branch 'maint-0.2.8' into release-0.2.8tor-0.2.8.4-rc
commitfa6a228ce86c2737447f32c78eedc00083eb826c
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:36:40 +0000 (14 20:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:36:40 +0000 (14 20:36 -0400)
tree7cee62c8a5313a3e3b50e2ba52b989e4cb95b40b
parent1cdb839108ef7487aaa516ab003d1afd7abfecc6
parent3a0d42fbf97384526fb51de9a58e9b49bbccf2e8
Merge branch 'maint-0.2.8' into release-0.2.8