commit 6db1160f54bfae707b63875fcb84b36921a5ad6d
Merge: 3630649b79 debede5e50
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon May 17 09:09:49 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40317 | 5 +++++
src/app/config/config.c | 17 +++++++++--------
src/app/config/config.h | 3 +++
src/app/main/main.c | 22 +++++++++++++++++-----
4 files changed, 34 insertions(+), 13 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
