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

[nickm at torproject.org]

commit 7e4623a2353541cfdcad02bc2b9cb05bcc7a7c81
Merge: f0f22ad92 3930ffdf6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 16 08:47:41 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24898-029 |  6 ++++++
 src/or/command.c     | 10 ----------
 2 files changed, 6 insertions(+), 10 deletions(-)