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

[nickm at torproject.org]

commit 5b072fd46982291cede10781f4aa0710d14d827d
Merge: 060f6f607 541b89b06
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 29 11:17:31 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 Makefile.am      | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)