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

[nickm at torproject.org]

commit 1eb7041ef105af931d1eb3984aeddb2e79aa03a1
Merge: e3966d47c 0aa794d30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:34:10 2018 -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(-)