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

[arma at torproject.org]

commit 2c04c506a480d2e7ab39a51c781f811963f30c9c
Merge: 43e12a7 9fcc142
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 12 14:38:11 2011 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

 src/common/torint.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --combined src/common/torint.h
index f624bff,2a9fba6..1faf65a
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@@ -115,12 -115,13 +115,12 @@@ typedef unsigned int uint32_t
  #define UINT32_MAX 0xffffffffu
  #endif
  #ifndef INT32_MAX
- #define INT32_MAX 0x7fffffffu
+ #define INT32_MAX 0x7fffffff
  #endif
  #ifndef INT32_MIN
  #define INT32_MIN (-2147483647-1)
  #endif
 +#endif
  
  #if (SIZEOF_LONG == 4)
  #ifndef HAVE_INT32_T