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

[nickm at torproject.org]

commit ccb671dc1cf8171a4f0df5940ba71b8cf89c04d3
Merge: 841f48ac4 fd0a894d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 5 10:21:05 2017 -0400

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