Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9
commita2aaf9509ba578f4e7705b506ee9a0f764d24ff2
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:29:15 +0000 (19 16:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:29:15 +0000 (19 16:29 -0500)
tree3aa4f0c675c3e702fdc5acb1f48a9de2d686bd63
parent36567c5ca4a1f9800415c772c87ee17dfba8d75d
parent490ae26b24a6b2b8843515425cedabf99801163a
Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9