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

[nickm at torproject.org]

commit ca93cec5b0e6adbdc280d5463c4df6b02338728c
Merge: 90c3764 f9636eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 8 11:03:25 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9