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

[nickm at torproject.org]

commit 90c3764704b8ce986ee847b2cedc1a79b7d14b0d
Merge: 669d79d 5d4ff91
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 8 09:06:23 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9