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

[nickm at torproject.org]

commit c6b8f7843a2dc5434bd105749d6a8d679913b4c9
Merge: 2e94df92c 05f5f6500
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 10 09:42:57 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(-)