[tor-commits] [tor/master] Merge branch 'tor-github/pr/1886'
dgoulet at torproject.org
dgoulet at torproject.org
Tue May 19 19:22:36 UTC 2020
commit ca13249dcc3e9974c35d6c29a2622a5c8d4cf32e
Merge: ee0fb69fe cce16a939
Author: David Goulet <dgoulet at torproject.org>
Date: Tue May 19 15:18:17 2020 -0400
Merge branch 'tor-github/pr/1886'
src/lib/encoding/confline.c | 5 ++---
src/lib/fs/conffile.c | 1 +
src/test/conf_examples/empty_3/expected_log | 2 +-
src/test/conf_examples/include_1/expected_log | 2 +-
src/test/conf_examples/include_bug_31408/expected_log | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
More information about the tor-commits
mailing list