commit ef16a11b90a107c6bc5178af1cbd083f80b39842
Merge: 395fa0258 0b1a054d6
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Apr 10 14:26:32 2018 -0400

    Merge branch 'maint-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

Reply via email to