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

[nickm at torproject.org]

commit 99513f763c1867e0f6f45c47d2ad36c4f4097a42
Merge: 8d3f412 aaeb50b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 23 08:08:19 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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