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

[nickm at torproject.org]

commit f602172dbaa9b0db49d6de993c9e13a48d12079f
Merge: e7ade23 10baf2c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 7 18:28:09 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9
    
    (ours merge, to avoid taking 20865 fix)