[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug4650_nm_squashed'

[nickm at torproject.org]

commit 5e9d349979f550474ba105491ba463a8b69a88ae
Merge: 73d4dbe ff282a1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 10 17:59:49 2012 -0500

    Merge remote-tracking branch 'public/bug4650_nm_squashed'

 changes/bug4650     |    7 +++++++
 doc/tor.1.txt       |    4 ++--
 src/common/compat.c |    9 +++++----
 src/or/config.c     |   33 +++++++++++++++++++++++++++------
 4 files changed, 41 insertions(+), 12 deletions(-)