Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
commit6f87a85897ca82fac9fc132e0f0cf41eacab20d4
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:53:14 +0000 (23 08:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:53:14 +0000 (23 08:53 -0400)
treee2709e42d8dd689f7a41ae866f4c1f5c1604dcf3
parent91c17ffbd61348e63cac81e90583f0b22b3c17d4
parentf7222e6d8cf31ce0e2a4653477ab42645c045db6
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8