commit 48d8fe533e977c14983f56de0ca572d842b5aadc
Merge: 7f629f7fd 1f739e9b0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Thu May 3 13:40:10 2018 -0400
Merge remote-tracking branch 'dgoulet/ticket25990_034_01'
src/or/config.c | 1 +
src/or/dirauth/dirvote.c | 6 ++++--
src/or/dirauth/mode.h | 38 ++++++++++++++++++++++++++++++++++++++
src/or/dirauth/shared_random.c | 1 +
src/or/directory.c | 3 ++-
src/or/include.am | 1 +
src/or/main.c | 3 ++-
src/or/networkstatus.c | 3 ++-
src/or/nodelist.c | 2 ++
src/or/router.c | 10 ++--------
src/or/router.h | 1 -
src/or/routerlist.c | 1 +
12 files changed, 56 insertions(+), 14 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits