commit 0b50ca565d027606aa247a6ec7f85429f3f50543 Merge: eca4c39a4 fa38bbb70 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 09:49:53 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(-)