commit a01b4d7f87f2217f55f5c5113fe19a2d3081a44c Merge: 228d25ddf fedb3e46e Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 3 09:53:46 2018 -0400

Merge remote-tracking branch 'rl1987/ticket26527'

changes/ticket26527 | 3 +++ src/lib/cc/compat_compiler.h | 11 ----------- src/lib/fs/mmap.h | 4 ++-- src/lib/malloc/util_malloc.h | 8 ++++---- src/lib/string/compat_string.h | 4 ++-- src/lib/string/printf.h | 4 ++-- src/lib/string/util_string.h | 24 ++++++++++++------------ 7 files changed, 25 insertions(+), 33 deletions(-)