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

[nickm at torproject.org]

commit b83d46feb87d1a629a1798907cac279df257df05
Merge: f3e21c276 fb309f6eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 13:25:39 2019 -0500

    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(-)