commit fe0bfbf755de7aff7dfbf4db11fce4f78c0b5950 Merge: c8bcbf5 e7ade23 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 7 11:25:54 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/test/test_options.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)