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

[nickm at torproject.org]

commit f7b06202c787d117eb22f04798a6f3f4b6722af1
Merge: 3c6d4fe04 26f68dfce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 14 13:21:28 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9
    
    "ours" merge to avoid version bump.