commit e5b79b5bb5b699388e6d3016f284a7a3f530c7c9 Merge: 19d6650 0b827cb Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 15:44:45 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

src/common/compat.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-)