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

[nickm at torproject.org]

commit e065f08fe8bca501fdec0bfb91ae4270fa5c7ed6
Merge: 87fca6995 3150c3035
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 12:18:31 2020 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

 configure.ac                        | 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)