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

[nickm at torproject.org]

commit 3cf863df1c29128aa10533d99c897a06dcac9e0c
Merge: 2153814ba d5eea977b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 27 12:33:21 2017 -0400

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