Merge remote-tracking branch 'public/bug6538'

Conflicts:
	configure.ac

diff --cc configure.ac
index ab291b11c4d67aead3fe0122089ad408f8899053,f5f8eacb7e605d31601391d8c5258c0f86907653..7f33828669698fd87b51c9013f62c6601e90fa77
--- 1/configure.ac
--- 2/configure.in
+++ b/configure.ac
@@@ -302,7 -300,7 +302,8 @@@ AC_CHECK_FUNCS
          gmtime_r \
          inet_aton \
          ioctl \
 +        issetugid \
+         llround \
          localtime_r \
          lround \
          memmem \

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/or/routerlist.h
Simple merge

diff --cc src/test/test_dir.c
Simple merge