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

[nickm at torproject.org]

commit 4a27e6e2352a71881712952b6ba2c6683210ee96
Merge: 74b1ed684 9eb6f9d3c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:34:10 2018 -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(-)