[or-cvs] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[arma@xxxxxxxxxxxxxx]

commit d009160c73caf714efe89389f78661e7af0fe3fd
Merge: 19cbb74 9b745cd
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Sat Feb 12 05:01:56 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug1074-part2        |    6 +
 changes/bug2004              |    4 +
 changes/bug2181              |    4 +
 changes/bug2203              |    6 +
 changes/bug2279              |   15 +
 changes/bug2358              |    5 +
 changes/bug2378              |    8 +
 changes/bug2408              |    6 +
 changes/bug2409              |    4 +
 changes/bug2450              |    5 +
 changes/bug2470              |    5 +
 changes/geoip-feb2011        |    3 +
 configure.in                 |   14 +
 contrib/tor-exit-notice.html |   18 +-
 doc/spec/control-spec.txt    |    6 +-
 doc/spec/dir-spec.txt        |    5 +
 doc/tor.1.txt                |   27 +-
 src/common/compat.c          |    7 +-
 src/common/crypto.c          |   19 +-
 src/common/crypto.h          |    1 -
 src/common/tortls.c          |    1 +
 src/config/geoip             | 5232 +++++++++++++++++++++++++++---------------
 src/or/circuitbuild.c        |   92 +-
 src/or/config.c              |   14 +-
 src/or/connection.c          |    5 +-
 src/or/connection_edge.c     |   22 +
 src/or/directory.c           |    7 +-
 src/or/dirvote.c             |   11 +-
 src/or/hibernate.c           |    6 +-
 src/or/main.c                |   13 +
 src/or/onion.c               |    4 +
 src/or/or.h                  |   11 +
 src/or/reasons.c             |    5 +
 src/or/routerlist.c          |    4 +-
 src/or/routerparse.c         |    2 +-
 35 files changed, 3718 insertions(+), 1879 deletions(-)

diff --combined configure.in
index 5246c0a,9cbfbb1..1ec100e
--- a/configure.in
+++ b/configure.in
@@@ -4,7 -4,7 +4,7 @@@ dnl Copyright (c) 2007-2008, The Tor Pr
  dnl See LICENSE for licensing information
  
  AC_INIT
 -AM_INIT_AUTOMAKE(tor, 0.2.2.19-alpha)
 +AM_INIT_AUTOMAKE(tor, 0.2.2.22-alpha)
  AM_CONFIG_HEADER(orconfig.h)
  
  AC_CANONICAL_HOST
@@@ -848,6 -848,20 +848,20 @@@ AC_SUBST(BINDIR
  LOCALSTATEDIR=`eval echo $localstatedir`
  AC_SUBST(LOCALSTATEDIR)
  
+ if test "$bwin32" = true; then
+   # Test if the linker supports the --nxcompat and --dynamicbase options
+   # for Windows
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase"
+   AC_MSG_CHECKING([whether the linker supports DllCharacteristics])
+   AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
+     [AC_MSG_RESULT([yes])]
+     [save_LDFLAGS="$save_LDFLAGS $LDFLAGS"],
+     [AC_MSG_RESULT([no])]
+   )
+   LDFLAGS="$save_LDFLAGS"
+ fi
+ 
  # Set CFLAGS _after_ all the above checks, since our warnings are stricter
  # than autoconf's macros like.
  if test "$GCC" = yes; then