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

[nickm at torproject.org]

commit c1d23c65f63eb347052ce8fb59e29b4459ed32a2
Merge: 56788a2 0d4d9b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 23 14:34:14 2017 -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(-)