commit dc9274dec3ded209124002e90b9b028cbb953d56 Merge: 38003f4 3156392 Author: Nick Mathewson nickm@torproject.org Date: Thu May 11 07:41:21 2017 -0400

Merge remote-tracking branch 'argonblue/bug22177'

src/test/test_options.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)