commit 710188f84e9d6652662901403d0ae31392714306 Merge: f5e3bcb60 98ee23ca1 Author: Nick Mathewson <ni...@torproject.org> Date: Thu Jul 12 14:32:16 2018 -0400
Merge branch 'maint-0.3.2' into maint-0.3.3
changes/task26771 | 4 ++++
src/or/auth_dirs.inc | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
