[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit fc47cc3ed97b328b8ec341320471cff3f538960d
Merge: 5efbd41 52cb1ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 1 10:06:17 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/bug20235 |  4 ++++
 configure.ac     | 30 ++++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)