[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit 0a05afa96dde84b010c87546ba49a801df92ab40
Merge: c4b7b4a dd17df2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 08:54:30 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug18809 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)