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

[nickm at torproject.org]

commit 808e52d96b7920fca70fec1ac4d0b121c3bc9c22
Merge: 6006bd0 698df98
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 23 08:19:55 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(-)