commit 4d052b611bc3fdc9f50042cbb6be3578bab5ed7a
Merge: 8a49a4411 559f79fd7
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Jul 18 15:03:35 2018 -0400
Merge branch 'maint-0.3.2' into release-0.3.2
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
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
