[tor-commits] [tor/master] Merge remote branch 'sebastian/bug2250' into maint-0.2.2

[nickm at torproject.org]

commit 00446973f25227c0f805b7430e1ede6679e7ed16
Merge: dbd4a01 5c7c5e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 8 16:13:28 2011 -0500

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

 changes/bug2250 |    5 +++++
 src/or/config.c |   13 ++++++++-----
 src/or/or.h     |    5 +++++
 3 files changed, 18 insertions(+), 5 deletions(-)