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

[nickm at torproject.org]

commit cc1f563df8d63bad784cd241f2e9c1b6b30cc017
Merge: a06093faa bf71dce01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:34:12 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(-)