[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug9651'

[nickm at torproject.org]

commit 7f2415683a86dcd72270b75c467a6ddc5649a7a8
Merge: a26a579 43b9b51
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 14 11:43:33 2013 -0400

    Merge remote-tracking branch 'asn/bug9651'

 src/or/config.c |   11 +++++++++++
 1 file changed, 11 insertions(+)