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

[nickm at torproject.org]

commit e0d1ab41723ac0cbc1b8f23d3235f1edc6b0e239
Merge: 87012d076 909c91049
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:35:43 2017 -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(-)