commit d3048a8f5b1db2179dee4c30c1ad3d94f1972363 Merge: 9703b4148 7fae562a4 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 1 09:35:43 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)