commit 81fe3e438b39cd14986247581d03cb0d0d650f1d Merge: 73d2f33 bc66878 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 20 13:00:17 2012 -0500 Merge remote-tracking branch 'sebastian/bug5161' configure.in | 16 ++++++++++++++++ src/common/compat.c | 10 ++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)