[tor-commits] [tor/master] Merge branch 'feature13865_test'

[nickm at torproject.org]

commit 3b96bf68315083f83a5f807ccf6f41feafeeb445
Merge: 5c807f3 a9caeb9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 2 14:38:47 2015 -0500

    Merge branch 'feature13865_test'

 src/test/test_cmdline_args.py |   39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)