[tor-commits] [tor/master] Merge remote-tracking branch 'ahf-github/bugs/26437'

[nickm at torproject.org]

commit c7dcf252fd509714d7607d89b7416ffb313d8365
Merge: 5aaea38d8 46501cdd1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 14:33:31 2018 -0400

    Merge remote-tracking branch 'ahf-github/bugs/26437'

 changes/bug26437   | 3 +++
 src/ext/tinytest.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)