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

[nickm at torproject.org]

commit ac21fb8c68d2931293ddd0d70a024ef17f065191
Merge: 6babd3d9b 586c327e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 14:40:55 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 configure.ac                        | 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)