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

[nickm at torproject.org]

commit d88ce331ef0d25a1db279d3ba7c952fbb63eabe7
Merge: cb1a3674e c8ccd028a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 2 12:11:16 2018 -0400

    Merge branch 'bug26594'

 configure.ac                   |  2 ++
 src/lib/string/compat_string.h | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)