commit c19c726b750a0e15ef8db587bd05092366157522 Merge: adaf1d0b8 508002a4c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 21 09:58:52 2019 -0500 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(-)