commit 037fb0c804efda988c5c05f0384fccd426f807d0
Merge: a51630cc9 31508a0ab
Author: Nick Mathewson <[email protected]>
Date: Thu Apr 12 11:14:42 2018 -0400
Merge branch 'maint-0.3.3'
changes/bug24782 | 4 +++
src/common/compat.c | 4 +--
src/common/compat.h | 2 +-
src/or/config.c | 35 +++++++++++++--------
src/or/config.h | 11 +++++++
src/test/test_config.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 123 insertions(+), 16 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
