[tor-commits] [tor/master] Merge remote-tracking branch 'Ryman/bug4341'

[nickm at torproject.org]

commit eb5f22eff22745ad85741106215ee0831325c0bf
Merge: 824df4a db318dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 3 13:16:22 2013 -0400

    Merge remote-tracking branch 'Ryman/bug4341'

 changes/bug4341        |    2 ++
 src/or/config.c        |   48 ++++++++++++++++++++++++++++++++++++++++--------
 src/test/test_config.c |   36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 8 deletions(-)