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

[nickm at torproject.org]

commit d528690e90914dfa028b6afbccb80f3b5f02dc87
Merge: a6eaa12 aaeb50b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 23 08:08:23 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/bug21035 | 6 ++++++
 1 file changed, 6 insertions(+)