[tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 8b393afa94891cb7d4d0371ff38469fbabbe61b3
Merge: 1db6eb6 fe86be6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 18 12:44:37 2011 -0400

    Merge remote branch 'origin/maint-0.2.2'
    
    Trivial Conflicts:
    	configure.in

 changes/bug2696 |    5 +++++
 configure.in    |   22 ++++++++++++++++++----
 src/or/geoip.c  |   18 +++++++++++++-----
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --cc configure.in
index d7cb91f,4436fe2..f5dcf44
--- a/configure.in
+++ b/configure.in
@@@ -1129,10 -927,11 +1135,11 @@@ if test x$enable_gcc_warnings = xyes |
      CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement -Wold-style-definition"
    fi
  
 -  if test x$have_gcc42 = xyes ; then 
 +  if test x$have_gcc42 = xyes ; then
      # These warnings break gcc 4.0.2 and work on gcc 4.2
      # XXXX020 See if any of these work with earlier versions.
-     CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1"
+     CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wstrict-overflow=1"
+ 
      # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3.
    fi