[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit fb33bcbcf0fff2f5d6fa29d1097a943b1a764572
Merge: 71b9f4f a535735
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 16:36:58 2017 -0400

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