commit 657297a9f8bedfab2dadfaee53768a1f9b8a558e Merge: 511c900 83439e7 Author: Roger Dingledine arma@torproject.org Date: Thu May 25 00:28:11 2017 -0400
Merge branch 'maint-0.3.0'
changes/bug22370 | 4 ++++ src/or/dirserv.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)