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

[nickm at torproject.org]

commit 6155f7669132165b71080663a83a914a7b8d8017
Merge: 987f628b7 7c2f688fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:29:00 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(-)