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

[nickm at torproject.org]

commit 1fbb66fa77939ffcfc57056ce212e7ecf98ad7af
Merge: 0a0e513 c27ae62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 23 11:02:04 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/bug21051 | 3 +++
 configure.ac     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)