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

[nickm at torproject.org]

commit 2f7c10df1216fbad4c7a981e180843ea5b7aca74
Merge: d6ecfe6 82bd2af
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 1 13:35:46 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9