commit 6cb467b462bda8d623c1a061ea2107084ff1cb41
Merge: a9736f1f3 71d503201
Author: Nick Mathewson <[email protected]>
Date: Mon Apr 30 09:45:28 2018 -0400
Merge remote-tracking branch 'github/ticket23354'
changes/ticket23354 | 6 +++
doc/tor.1.txt | 84 ++++++++++++++------------------
src/or/config.c | 84 ++++++++++++++++----------------
src/or/confparse.c | 80 ++++++++++--------------------
src/or/confparse.h | 6 ++-
src/or/directory.c | 54 ++++++++------------
src/or/directory.h | 4 +-
src/or/or.h | 18 +++----
src/test/test_dir.c | 127 +++++++++++++++++++++---------------------------
src/test/test_options.c | 12 ++---
10 files changed, 204 insertions(+), 271 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
