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

[nickm at torproject.org]

commit 2f3b9151ec55fbfe7467b7e0a5ee3fccd769c0e3
Merge: 92b3fc931 532873a92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:24:48 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(-)