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

[nickm at torproject.org]

commit bc052d49782ec17de9f90a0ec3cf4528afc8c33f
Merge: 7d3883d 528dcd1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 1 15:39:01 2017 -0500

    Merge branch 'maint-0.3.0'
    
    "ours" to avoid version bump