commit 56e5b0b2b6d546df522a9e3d9756ee4a8af72976 Merge: f9e5362ade 3bcbd69a77 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 23 10:09:14 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/ticket40061 | 5 + src/app/config/fallback_dirs.inc | 503 ++++++++++++++++++--------------------- 2 files changed, 238 insertions(+), 270 deletions(-)