commit 221db44c6b162a9e5bd2c1e1acf2e4efea7247ec Merge: f1c58bbf4 6506b1ee9 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 11 09:41:05 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket24803 | 5 + src/or/fallback_dirs.inc | 581 ++++++++++++++++++++++++++--------------------- 2 files changed, 333 insertions(+), 253 deletions(-)