commit 544f73d25f309bbf034119429775d3ac22c027c2
Merge: a15075721 8408331b3
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Mon Sep 10 09:42:57 2018 -0400
Merge branch 'maint-0.3.2' into release-0.3.2
configure.ac | 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)