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

[nickm at torproject.org]

commit ddfb87724265f5926abd2469d9f7cbc3893e71a8
Merge: 90758b2 875b1fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:06:41 2017 -0400

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