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

[nickm at torproject.org]

commit c2f413e24524cd377a9e064111235f7ea3ff10dd
Merge: 80dbe06ce a7e777ab8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 22 08:34:33 2017 -0500

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