Merge branch 'maint-0.4.0'
commitd04f6d9dffcb1f67c3fc693284810edee0f61f3d
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Feb 2019 14:52:35 +0000 (21 09:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Feb 2019 14:52:35 +0000 (21 09:52 -0500)
tree6119b6c4bebbd891ec4e2d401dd90ace1b5c3f8f
parentaa79196ee05e4ee8169de2156478e7cfba49ef0e
parentdf3484b2b01835c075b57c30b2ea3ac260ee157c
Merge branch 'maint-0.4.0'

"ours" to avoid version bump