[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

commit 580c68ec1d15b53ae187d846804e08b99b4a514b Merge: 7f98df073 d8f41c287 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 18 08:04:40 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)