[tor-commits] [tor/master] Merge branch 'ticket25948_squashed'
nickm at torproject.org
nickm at torproject.org
Mon Apr 30 20:48:59 UTC 2018
commit 72124dc1ef68b870ddec615249e25ddb72d6d4cb
Merge: a9dfaafca 987a7f667
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Apr 30 16:46:59 2018 -0400
Merge branch 'ticket25948_squashed'
changes/ticket25948 | 9 +++++++++
src/or/main.c | 44 ++++++++++++++++++++++++++++++++++++++------
src/or/main.h | 1 +
src/or/or.h | 9 ---------
src/or/rephist.c | 2 +-
src/or/statefile.c | 13 +++++++++++++
src/or/statefile.h | 1 +
7 files changed, 63 insertions(+), 16 deletions(-)
More information about the tor-commits
mailing list