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

[nickm at torproject.org]

commit fb2af84a3fd4723e1357e5061568ddea2703705b
Merge: 75dd7f021 52b508735
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 7 10:23:40 2019 -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(-)