Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2
commitde3cf40fa658d62a61bb620c9dba8e90105da339
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:30:44 +0000 (19 16:30 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:30:44 +0000 (19 16:30 -0500)
tree638b57037260fe292c86f88ff91ab68448f62760
parente2aacf100f5112aa8d0564b9f90ce38048ee0a82
parentf870f9c8bcdbf2f8fd1c1e1feb9f88dc111ab25a
Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2