commit 6beeb10070190b8caf5af379476f725c38fbd663
Merge: ce4ac7aac 8f0dffe32
Author: Nick Mathewson <[email protected]>
Date: Tue Sep 26 12:26:01 2017 -0400
Merge branch 'typecheck4'
changes/ticket23643 | 6 ++++
src/or/circuitstats.c | 8 ++---
src/or/config.c | 14 +++++++--
src/or/confparse.h | 72 ++++++++++++++++++++++++++++++++++++++++++++
src/or/or.h | 8 ++---
src/or/shared_random_state.c | 9 ++++--
src/or/shared_random_state.h | 2 +-
src/or/statefile.c | 10 ++++--
8 files changed, 113 insertions(+), 16 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
