commit be3d8cb1762d24e4ed87e7f26df53b1e564e6aac Merge: 85db0c46e 4aaa4215e Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 12 12:25:51 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

src/or/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)