From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jul 2018 12:30:01 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.6-rc~8^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcce3e7e0b53b0d800337c53b855713bfb83c37e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

bcce3e7e0b53b0d800337c53b855713bfb83c37e
diff --cc configure.ac
index 56c9d1b910,b71d648f15..4f5d8337ee
--- 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 \