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

[nickm at torproject.org]

commit 92a88fede564dbc723ab77d952f89d3fac7bc430
Merge: f869cd012 36885f34f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 15:13:34 2018 -0400

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