[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 338dbdab93328e00b5e80934ce0352bebaf9ce25
Merge: 62482ea27 ccf0f77da
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:59:27 2018 -0500

    Merge branch 'maint-0.3.3'

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