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

[nickm at torproject.org]

commit 0b8de7b3c3b62fe553b8e5c75d2f85ab22628e01
Merge: b6a88173b 074b182ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 12:40:27 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(-)