commit 37698d92bbf601d8399292f9e42a09d188cc5d5f
Merge: feb744f0d 1bff5646e
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Feb 21 13:25:39 2019 -0500
Merge branch 'maint-0.4.0' into release-0.4.0
configure.ac | 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)