commit 3015d3d7c4f0b6fd5e7b9c8271b03e80791beade Merge: e8c256ca8 cf0597c3b Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:12:39 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(-)