commit bd664bca96566f2491c854dc9f07966650b1c61a Merge: 084446058 c53567c36 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 5 13:33:04 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(-)