commit 016bf942392693209ea65b0781ad85a6a725351b Merge: eca87ef76 8db047b92 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 8 09:02:05 2018 -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(-)