commit 66258f8878abe6323c56bcf0b20796e1c43d66fc
Merge: 1ea155b abb9a5b
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jul 13 16:55:02 2017 -0400
Merge branch 'fewer-diffs' into maint-0.3.1
changes/bug22883-config | 7 +++++++
doc/tor.1.txt | 10 ++++++++++
src/or/config.c | 1 +
src/or/consdiffmgr.c | 13 ++++++++++++-
src/or/or.h | 5 +++++
5 files changed, 35 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
