commit 85538498b685bad290120b99481c7375b4886764 Merge: 7fea2c3 9fe6ffa Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 8 07:49:56 2016 -0500 Merge branch 'maint-0.2.9' src/test/test_options.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)