[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2

[nickm at torproject.org]

commit f0d9e2d6507adcc069b38cd9e0aaf6702f576314
Merge: 4010427 66de6f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 28 21:15:14 2011 -0400

    Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2

 changes/bug3012 |    5 +++++
 src/or/config.c |   11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletions(-)