commit 3aba8490ba590899b6c23071ef0b4269d8c36d37
Merge: 4984d62 5636b16
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Jul 12 10:16:06 2017 -0400
Merge branch 'maint-0.3.1'
changes/bug22349 | 9 +++++++++
src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 53 insertions(+), 12 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
