commit bc5d904237d3431163ae463488efbc063292e408 Merge: 035a35178 bbbb5f39b Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 12 12:05:32 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(-)