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

[nickm at torproject.org]

commit 0820031419efcd39c2fddfa5efebbaa779982620
Merge: a790454 1ec4d52
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Apr 12 21:42:45 2014 -0400

    Merge remote-tracking branch 'asn/bug11486'

 src/test/test_config.c |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)