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

[nickm at torproject.org]

commit 2e219291bee2d378344286ba091ba09527b07188
Merge: ba4a9cf0c 6bda6777c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:21:36 2017 -0500

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