commit cb51b0d55eea5802ca0917417055392d3c71ef35
Merge: 9b2d87029 0a33522b6
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Dec 5 13:33:05 2019 -0500
Merge branch 'maint-0.4.2' into release-0.4.2
configure.ac | 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)