[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit 77c5d8c73856da7f07508fc263685717bd88dbc7
Merge: fa73f59 8e439a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:28:11 2017 -0400

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