commit 6628c95e540b7f499195b2973acd1e089f14a62e Merge: a8c54ce58 951b9f1fa Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 19 19:35:46 2017 -0400 Merge remote-tracking branch 'pastly2/bug23566_032_01' changes/bug23566 | 4 ++++ src/test/test_options.c | 15 ++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-)