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

[nickm at torproject.org]

commit 1a7af7470fdd6173f1b876fc6fee2b171174b4ff
Merge: f3804f5 ec3ce77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:05:37 2017 -0400

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