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

[nickm at torproject.org]

commit 51dc284088dc5f6f513bf8db23b0d820ebf5575b
Merge: e210015 a271ad2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:27:22 2017 -0500

    Merge branch 'maint-0.2.9'

 changes/bug21280 | 5 +++++
 1 file changed, 5 insertions(+)