[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket22437'

[nickm at torproject.org]

commit 2bfc490c1e03ec188dabc22aa78603f3fba34ad6
Merge: 80a22f536 d7d8d2c20
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 12 09:30:33 2017 -0400

    Merge remote-tracking branch 'teor/ticket22437'

 src/test/include.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)