[tor-commits] [tor/master] Merge remote-tracking branch 'twstrike/options_test'

[nickm at torproject.org]

commit ae3d2a93f0cbf05803d358b2e86de1f79f103669
Merge: f557a7f 32946e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 20:14:18 2016 -0500

    Merge remote-tracking branch 'twstrike/options_test'

 src/test/test_options.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)