commit 8020d6fb05d9477e77c6ca554dc1288873f6115c Merge: ba28704b2 da716fdfb Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 6 15:33:25 2018 -0500 Merge remote-tracking branch 'tor-github/pr/464' changes/feature27367 | 4 ++++ src/feature/dirauth/process_descs.c | 12 +++++++++--- src/feature/dirauth/process_descs.h | 3 ++- src/feature/dircache/dircache.c | 4 ++-- src/lib/string/util_string.c | 13 +++++++++++++ src/lib/string/util_string.h | 1 + src/test/test_util.c | 7 +++++++ 7 files changed, 38 insertions(+), 6 deletions(-)