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

[nickm at torproject.org]

commit 039fc8427a512efce87b7bd21c10c4adca4ba30d
Merge: 61c0bae c662bef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 12:22:36 2016 -0400

    Merge branch 'bug18841_1_025' into maint-0.2.7

 changes/bug18841.1 | 7 +++++++
 configure.ac       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)