Merge branch 'trove-2017-008_030' into maint-0.3.0
commit9d8d4cb3fa3e678955b30dc9ff8d01b3f54d805d
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 13:40:36 +0000 (18 09:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 13:40:36 +0000 (18 09:40 -0400)
tree8450944b8d8a2d5e894a0866161377c55236368a
parent7df790890593de1cc2aef84305102f80c00bb8f8
parent09ea89764a4d3a907808ed7d4fe42abfe64bd486
Merge branch 'trove-2017-008_030' into maint-0.3.0