commit 5d99985e438e6f602731612248e8f58f66db7a49 Merge: 400bc46d8 2e0d0360c Author: David Goulet <dgoulet@torproject.org> Date: Tue May 19 15:14:38 2020 -0400 Merge branch 'tor-github/pr/1894' src/app/config/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)