[tor-commits] [tor/master] Merge branch 'bug26101_26102'

[nickm at torproject.org]

commit add00045aa56c77b93b1fb4b3cf424588a7baf0e
Merge: 87a7748a8 db94d7fed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 08:42:04 2018 -0400

    Merge branch 'bug26101_26102'

 changes/bug26101_26102 | 5 +++++
 scripts/test/cov-diff  | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)