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

[nickm at torproject.org]

commit f704c29e07b127ee38c1f67bd7816cd8b3f93d47
Merge: a2ecc19ab 942c2da48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 16 11:32:55 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(-)