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

[nickm at torproject.org]

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 14:40:22 2017 -0400

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