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

[nickm at torproject.org]

commit 83648ef077d7972f27d82e22b9189af8202b2264
Merge: f9fe48989 af8cadf3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 17 11:12:33 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24898       | 8 ++++++++
 src/or/command.c       | 6 ------
 src/or/connection_or.c | 6 ++++++
 3 files changed, 14 insertions(+), 6 deletions(-)