commit 05bd43f4258b38589cf034371daa6bd13c2d2307 Merge: 11760f914 c663716b6 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 21 09:58:52 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(-)