Merge commit 'origin/maint-0.2.1'

Resolved conflicts in:
	configure.in
	src/or/Makefile.am
	src/tools/Makefile.am

diff --cc acinclude.m4
Simple merge

diff --cc configure.in
index a8890ff04914dc79d7df39932bd381ba685ea184,92dc45fd68acb7763043df37d25c35cdcc0eebae..80cdfc417ae8e93716e564054621858473f076c1
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -85,8 -90,17 +89,10 @@@ case $host i
       ;;
  esac
  
 -AC_ARG_ENABLE(geoip-stats,
 -     AS_HELP_STRING(--enable-geoip-stats, enable code for directories to collect per-country statistics))
 -
 -if test "$enable_geoip_stats" = "yes"; then
 -  AC_DEFINE(ENABLE_GEOIP_STATS, 1, [Defined if we try to collect per-country statistics])
 -fi
 -
  AC_ARG_ENABLE(gcc-warnings,
       AS_HELP_STRING(--enable-gcc-warnings, enable verbose warnings))
+ AC_ARG_ENABLE(gcc-warnings-advisory,
+      AS_HELP_STRING(--enable-gcc-warnings-advisory, [enable verbose warnings, excluding -Werror]))
  
  AC_ARG_ENABLE(local-appdata,
     AS_HELP_STRING(--enable-local-appdata, default to host local application data paths on Windows))
@@@ -279,8 -285,17 +285,21 @@@ LIBS="$save_LIBS
  LDFLAGS="$save_LDFLAGS"
  CPPFLAGS="$save_CPPFLAGS"
  
++
 +AM_CONDITIONAL(USE_EXTERNAL_EVDNS, test x$ac_cv_header_event2_dns_h = xyes)
 +
+ if test "$enable_static_libevent" = "yes"; then
+    if test "$tor_cv_library_libevent_dir" = "(system)"; then
+      AC_MSG_ERROR("You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent")
+    else
+      TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a"
+    fi
+ else
+      TOR_LIBEVENT_LIBS="-levent"
+ fi
+ AC_SUBST(TOR_LIBEVENT_LIBS)
+ 
++
  dnl ------------------------------------------------------
  dnl Where do you live, openssl?  And how do we call you?
  

diff --cc src/or/Makefile.am
index 3dc1889a903654d4ab2a14245f3f5ba5b7a5693b,ad2476ff15d7a78caaeaef7a88d8a6cddc4dc1b0..cfa8a035ad9ee6fd6f0cf926658bd4a91940210d
--- 1/src/or/Makefile.am
--- 2/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@@ -41,9 -32,23 +41,9 @@@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(data
  # matters a lot there, and is quite hard to debug if you forget to do it.
  
  tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
 -tor_LDADD = ../common/libor.a ../common/libor-crypto.a \
 -  -lz @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
 -test_SOURCES = buffers.c circuitbuild.c circuitlist.c \
 -      circuituse.c command.c config.c \
 -      connection.c connection_edge.c connection_or.c control.c \
 -      cpuworker.c directory.c dirserv.c dirvote.c \
 -      dns.c dnsserv.c geoip.c hibernate.c main.c $(tor_platform_source) \
 -      networkstatus.c onion.c policies.c \
 -      reasons.c relay.c rendcommon.c rendclient.c rendmid.c \
 -      rendservice.c rephist.c router.c routerlist.c routerparse.c \
 -      eventdns.c \
 -      test_data.c test.c
 -
 -test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
 -        @TOR_LDFLAGS_libevent@
 -test_LDADD = ../common/libor.a ../common/libor-crypto.a \
 -        -lz @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
 +tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \
 +      ../common/libor-event.a \
-       -lz -lm -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
++      -lz -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
  
  noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
  

diff --cc src/test/Makefile.am
index cdb5d85c28cc4d213b2562a53d808e93340e5704,0000000000000000000000000000000000000000..7df13da51e514e8454eadb613c9bafd660bb8993
mode 100644,000000..100644
--- 1/src/test/Makefile.am
--- /dev/null
+++ b/src/test/Makefile.am
@@@ -1,30 -1,0 +1,30 @@@
-       -lz -lm -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
 +TESTS = test
 +
 +noinst_PROGRAMS = test
 +
 +AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
 +        -DLOCALSTATEDIR="\"$(localstatedir)\"" \
 +        -DBINDIR="\"$(bindir)\""             \
 +      -I"$(top_srcdir)/src/or"
 +
 +# -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
 +# This seems to matter nowhere but on windows, but I assure you that it
 +# matters a lot there, and is quite hard to debug if you forget to do it.
 +
 +test_SOURCES = \
 +      test_data.c \
 +      test.c \
 +      test_addr.c \
 +      test_crypto.c \
 +      test_dir.c \
 +      test_containers.c \
 +      test_util.c \
 +      tinytest.c
 +
 +test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
 +        @TOR_LDFLAGS_libevent@
 +test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \
 +      ../common/libor-event.a \
++      -lz -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
 +
 +noinst_HEADERS = tinytest.h tinytest_macros.h test.h

diff --cc src/tools/Makefile.am
index 39c8277ccd8754fb930e2b083879cc025c76b0ba,41786e4378693e2245d36e4450e25d78c958cd78..be03f8d892308f02f004cb88d6e90ede36d2464a
--- 1/src/tools/Makefile.am
--- 2/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@@ -3,16 -3,16 +3,16 @@@ noinst_PROGRAMS =  tor-checkke
  
  tor_resolve_SOURCES = tor-resolve.c
  tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@
- tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@
 -tor_resolve_LDADD = ../common/libor.a  @TOR_LIBEVENT_LIBS@ @TOR_LIB_WS32@
++tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIBEVENT_LIBS@ @TOR_LIB_WS32@
  
  tor_gencert_SOURCES = tor-gencert.c
  tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
          @TOR_LDFLAGS_libevent@
  tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \
-         -lm -lz -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
 -        -lz  @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
++        -lm -lz @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
  
  tor_checkkey_SOURCES = tor-checkkey.c
  tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
          @TOR_LDFLAGS_libevent@
  tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \
-         -lm -lz -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
 -        -lz  @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
++        -lm -lz @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@