Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
commit912ae2b8dc5d13344035def71c6e083a92752c09
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:44:36 +0000 (7 08:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:44:36 +0000 (7 08:44 -0400)
treed6ffa9e6cbc1636b31866d9f373cfcd11beb467f
parent1570f17f97ad99ddf3f63745ab3571c1aa411141
parent9d5c6317b51530d606222cc2b7f6f5f5d7defe24
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9