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

[nickm at torproject.org]

commit 0d0c7a11649db161070ab96310ff301be6dd704c
Merge: 907cd8a 2a36541
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 08:05:37 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9