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

[nickm at torproject.org]

commit 94ad23deb216651844ab31c17809afa2fc8f9da1
Merge: d8d52f2b7 4ebd43654
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:28:39 2017 -0500

    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(-)