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

[nickm at torproject.org]

commit 36d1250a0193ccc7e9070106693f7f9c2799cab4
Merge: 2504c2d4a 3fa66f979
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 29 08:01:55 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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