commit 6d44cf66c7cca6e0aba5c7afb00683c98187ea60 Merge: ac93889ee ccf0f77da Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 3 11:59:27 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug25378 | 4 ++++ doc/tor.1.txt | 3 ++- src/common/log.c | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-)