[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm at torproject.org]

commit a26a2735b9cf9c6940d784f755f983088c333833
Merge: 8982719f6 4c355ff18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 15 12:20:57 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27081 | 4 ++++
 configure.ac     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)