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

[nickm at torproject.org]

commit 6a6173a21443884df37cfd4f6046dbe7ef2f2519
Merge: 2cc6d8d 8239af0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:29:49 2017 -0400

    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(-)