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

[nickm at torproject.org]

commit 1693b6151e1369ce0938761cac95e7a0a524f5f3
Merge: 50d4300e77 3271c0bde7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 16 09:18:51 2021 -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(-)