commit 77d9dd39c36a4da609c878840be35c515104fb9a Merge: 90b840a 7b64f17 Author: Nick Mathewson nickm@torproject.org Date: Wed May 3 09:33:37 2017 -0400

Merge remote-tracking branch 'argonblue/bug22103_fixtest'

src/test/test_options.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-)