commit a6240d578efcd381fb89974211a52121bc823c4a Merge: d3769dd4d d8d4fe83d Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 09:09:01 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(-)