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

[nickm at torproject.org]

commit f2270bf53f8d4ad1cda7eef62ebb64872d3f3c0a
Merge: 01ab67e 897d3c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 10:13:10 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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