From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Sep 2012 21:51:36 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug6538'
X-Git-Tag: tor-0.2.4.3-alpha~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75c9ccd4f851bac6d32cb08ded557ac207bc8002;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug6538'

Conflicts:
	configure.ac
---

75c9ccd4f851bac6d32cb08ded557ac207bc8002
diff --cc configure.ac
index ab291b11c4,f5f8eacb7e..7f33828669
--- a/configure.ac
+++ b/configure.ac
@@@ -302,7 -300,7 +302,8 @@@ AC_CHECK_FUNCS
          gmtime_r \
          inet_aton \
          ioctl \
 +        issetugid \
+         llround \
          localtime_r \
          lround \
          memmem \