commit 8294c40c96a9ec59ff3e0a3ce2f4926c275ab114 Merge: 5a2374b07 f8c0f694b Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 08:12:19 2018 -0400

Merge remote-tracking branch 'tor-github/pr/318'

changes/bug27428 | 3 ++ src/app/config/config.c | 3 ++ src/lib/string/util_string.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/string/util_string.h | 2 + src/test/test_util.c | 48 +++++++++++++++++++++++ 5 files changed, 146 insertions(+)