commit 3230814d2ba0b213e1eba645a7a610fd28e31a11
Merge: f46777163 0b1a054d6
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Apr 10 14:26:32 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug24854 | 3 +++
src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++
src/or/config.c | 34 +---------------------------------
src/or/include.am | 1 +
4 files changed, 38 insertions(+), 33 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
