commit 346f117b858fb419cf553354a1621f7658020289 Merge: bebfae568 c9906cc3f Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 16 08:29:12 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(-)