[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

[nickm at torproject.org]

commit dc3890439f156d4c79b153f13f7ecf3393362b29
Merge: 8f858de81 162a087e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:34:47 2017 -0500

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