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

[nickm at torproject.org]

commit 5b0ae084008eac13d051026c013862b239212807
Merge: d01abb934 c527a8a9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:43:10 2018 -0500

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