commit 60aa6dac342c732269cbeb23c9652e816605387e Merge: 00c3fba61 7bf4220a1 Author: teor teor@torproject.org Date: Fri Oct 25 17:17:39 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1467'

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