commit 0d4addfc73c2647357aaaede54dbf936ff189b2e
Merge: b1d6cf250 48ee85e0c
Author: Nick Mathewson <[email protected]>
Date: Tue Oct 24 08:24:12 2017 -0400
Merge branch 'bug23952_032' into maint-0.3.2
changes/bug23952 | 4 ++++
src/or/config.c | 22 ++++++++++++++++++++++
src/or/config.h | 1 +
src/or/or.h | 4 ++--
4 files changed, 29 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
