commit d911eb80f69dc6a63a85785e813bfd24290dc429 Merge: 49542ff72 4748fd23d Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 24 09:13:51 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(-)