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

[nickm at torproject.org]

commit 52cb1edda69b7f73b2aa7a8edfbc850a0b3769ff
Merge: f8a7972 16fcbd2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 1 10:05:44 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

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