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

[nickm at torproject.org]

commit 080bcfa2390a135f585d5fe386bf08834c16acdb
Merge: 023d756bf d5eea977b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 27 12:33:34 2017 -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(-)