[tor-commits] [tor/master] Merge branch 'bug1101_squashed'

[nickm at torproject.org]

commit 8b4e7f9ac8e70a1d646fe7689d48847188eb89a2
Merge: 878a684 e0651bb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 22 10:27:26 2011 -0500

    Merge branch 'bug1101_squashed'

 changes/bug1101     |    3 +++
 src/common/compat.c |   36 ++++++++++++++++++++++++++++++++++++
 src/common/compat.h |    1 +
 src/or/config.c     |    8 ++++++++
 4 files changed, 48 insertions(+), 0 deletions(-)