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

[nickm at torproject.org]

commit 73b1d93d757840a7162dc04a0caa691d03e17b37
Merge: 412da7c85c 665083be9f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 17:14:58 2020 -0500

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