commit 751595551afb6282d952c482a11db35daf3736ab
Merge: c349bfec3 93e7b837c
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jan 11 12:39:37 2018 -0500
Merge branch 'simplify_transition_allowed'
src/or/config.c | 319 ++++++++++++++++++++---------------------------------
src/or/confparse.h | 8 ++
2 files changed, 129 insertions(+), 198 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
