commit bc250fcabd4cb5695a0c3725e24eb6a30e54c238 Merge: 955a7f52d 124e06e85 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)