commit fe0c42631750aa40f66e34f829a04ddfce83fe10 Merge: da95b9135 96601a680 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 10 09:42:57 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(-)