[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug21294_030_02'

[nickm at torproject.org]

commit 96dce88d80f422914eb93a7236e5dc1eaed4cfb6
Merge: 6777cd0 5f6d53c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 2 09:07:20 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug21294_030_02'

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