commit 783fbe47dd774008f24d263f43c22fd3d68efa4f
Merge: 1440c4598 c31700d66
Author: Nick Mathewson <[email protected]>
Date: Wed Jul 18 15:04:27 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug26485 | 4 ++++
src/or/config.c | 9 ++++++++-
src/or/dirserv.c | 43 +++++++++++++++++++++++++++++++++++++------
src/or/dirserv.h | 3 +--
src/or/dirvote.c | 9 ++++++++-
src/test/test_dir.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
6 files changed, 110 insertions(+), 11 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
