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

[nickm at torproject.org]

commit 1494fa0d3b2a3902d0555bc5cc557b88c6130f48
Merge: 1712dc9 98ffb2e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 16:36:05 2017 -0400

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