commit bcce3e7e0b53b0d800337c53b855713bfb83c37e Merge: 21babc8d3 373b23a9e Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 08:30:01 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-)

diff --cc configure.ac index 56c9d1b91,b71d648f1..4f5d8337e --- a/configure.ac +++ b/configure.ac @@@ -608,10 -548,8 +608,9 @@@ AC_CHECK_FUNCS llround \ localtime_r \ lround \ - mach_approximate_time \ memmem \ memset_s \ + mmap \ pipe \ pipe2 \ prctl \