commit 613073e449c22ad3583e406e48cf5ada395489f0 Merge: 19e5b4c 5dbaf9d Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 22 12:47:21 2011 -0500

Merge remote branch 'sebastian/bug2504' into maint-0.2.2

changes/bug2504 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)