commit ef0b19aec68bf48018f4c833778bc9b966ab9a25 Merge: 7b7b817c3 f2e7570c7 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 12 08:57:37 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(-)