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

[nickm at torproject.org]

commit f86387039897ee1e8cccfc8060e74bdefa70c1fc
Merge: b925cef1e3 87492154e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 14 11:49:01 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(-)