commit 336f1fad325d3af022b348e55a8ba33aa770f987 Merge: 4ac3ccf28 5acf6f871 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 13:02:02 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)