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

[nickm at torproject.org]

commit 060f6f60792ca5c8062da3583cd281d827b7c5f7
Merge: 76be75b36 cc4ea34a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 23 19:36:45 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++--------
 2 files changed, 5 insertions(+), 8 deletions(-)