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

[nickm at torproject.org]

commit fdd4bc3f4348d55f3eeeef316ec80aec790770b3
Merge: cd60c6ec6b 21317c9229
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 3 13:39:54 2021 -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(-)