[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 0e101e65457163963b01722369eaef5b862a82f9
Merge: 0c58627 9281394
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 14 11:26:00 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21720 | 5 +++++
 doc/tor.1.txt    | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)