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

commit 09a3bd1ffeedb94c2b50c11ea702b46fcba9203c Merge: 72595eb02 0c4f0ec97 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 9 16:04:22 2019 -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(-)