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

[nickm at torproject.org]

commit 2446d4acc506842963a2b4d52ddcea95b5f6cccf
Merge: 471e0096a e46849846
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 14 13:22:04 2017 -0400

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