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

[nickm at torproject.org]

commit 82fca027352a17ca8d7dbb49b61dd1d6a2762f42
Merge: fc2d39af7 c9751e261
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 13:15:59 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(-)