[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/fix-macos-includes'

[nickm at torproject.org]

commit f0319fcbde2117098bcef12cc731600fd6a85afe
Merge: 365179cd1 f9e22c68a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 28 18:19:53 2018 -0400

    Merge remote-tracking branch 'catalyst-github/fix-macos-includes'

 src/common/compat.c            | 3 ---
 src/lib/process/env.c          | 4 ++++
 src/lib/string/compat_string.c | 1 +
 src/lib/time/compat_time.c     | 1 +
 src/lib/time/tvdiff.c          | 3 +++
 5 files changed, 9 insertions(+), 3 deletions(-)