commit ba7079fddf282f70085c3879c4e192f1af8bb578 Merge: f65c12351 5a1c3e44f Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 19 10:37:21 2019 -0400
Merge branch 'maint-0.2.9' into release-0.2.9
changes/ticket31406 | 3 +++ src/or/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)