diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-09 12:58:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-09 12:58:12 -0400 |
| commit | a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b (patch) | |
| tree | 452abe6e161edc285fea830df0039a1f4efb6de4 /configure.in | |
| parent | d3ff167e098fa44e4ec30c7e6f50127a8c99dae7 (diff) | |
| parent | b0695c11ebfff4ca4dc6570e49e27c03ca65e8ab (diff) | |
| download | tor-a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b.tar.gz tor-a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
configure.in
src/or/circuitbuild.c
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 824547c6d7..a449136f93 100644 --- a/configure.in +++ b/configure.in @@ -296,8 +296,10 @@ AC_CHECK_FUNCS( gmtime_r \ inet_aton \ localtime_r \ + lround \ memmem \ prctl \ + rint \ socketpair \ strlcat \ strlcpy \ |