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

[nickm at torproject.org]

commit 0f105d69fc79aae00df305a7a76a74652ebab947
Merge: 2b48b5363 5c4da2cac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 14 14:12:49 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(-)