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

[nickm at torproject.org]

commit f5d89fab2525fd8a105f9f0ea9258147bf16290e
Merge: 20e9b428c 94c59851d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 21 14:22:58 2017 -0500

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