From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Jan 2011 19:38:11 +0000 (-0500)
Subject: Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.3.1-alpha~179^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c04c506a480d2e7ab39a51c781f811963f30c9c;p=thirdparty%2Ftor.git

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

2c04c506a480d2e7ab39a51c781f811963f30c9c
diff --cc src/common/torint.h
index f624bff86e,2a9fba6fcf..1faf65abab
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@@ -115,8 -115,10 +115,8 @@@ typedef unsigned int uint32_t
  #define UINT32_MAX 0xffffffffu
  #endif
  #ifndef INT32_MAX
- #define INT32_MAX 0x7fffffffu
+ #define INT32_MAX 0x7fffffff
  #endif
 -#endif
 -
  #ifndef INT32_MIN
  #define INT32_MIN (-2147483647-1)
  #endif