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

[nickm at torproject.org]

commit 4178708f3c4a8e2bd077e31c01f3b6ab50f6d445
Merge: 567852f 0d0c7a1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 08:05:45 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9