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

[nickm at torproject.org]

commit 36ae644fcd8009b7b719e3d389ac84201129a678
Merge: 8fef85306 d17108a18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:57:42 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(-)