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

[nickm at torproject.org]

commit a9769b78f082b29d4b8a16f0f0a2f5d813656f6c
Merge: 499bdd81a 1ec386561
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:44:31 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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