commit e14da02ed09dafef289a3494ba1f58b7b7580b5f Merge: 281045126 cff7cb858 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 7 15:13:59 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)