Merge branch 'pr_719_squashed_040' into maint-0.4.0
commitc40d53ab3925638a04bd6d9088e748e0ea16cabf
authorNick Mathewson <nickm@torproject.org>
Fri, 8 Mar 2019 15:25:43 +0000 (8 10:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 8 Mar 2019 15:25:43 +0000 (8 10:25 -0500)
tree43b26a00a93348a96c257aa8c40347d1b4e4dd72
parent968d2b87cb035e1113fecf58e7c7c2432efcaea2
parentff410edec04793d6d72f9961acd2f13a5ee3b9b5
Merge branch 'pr_719_squashed_040' into maint-0.4.0