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

[nickm at torproject.org]

commit c11c851b390283271b2de6dd2cfd1512c9faa342
Merge: 7dd0813e7 ff27b7ce6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 18:05: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(-)