commit 5b5ec52cae4f886d451579f45984afcf96f3f3c2 Merge: 236e1f3 9281394 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 14 11:26:07 2017 -0400

Merge branch 'maint-0.3.0'

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