[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit c29a559e7ba36933cf9d6405017018c5817dde51
Merge: 06414b9 d72cfb2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 26 14:15:21 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22720 | 9 +++++++++
 src/or/control.c | 2 +-
 src/or/main.c    | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)