Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
commit73ba308d3d568eac81da358c4df29fda3f32e921
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2018 12:17:42 +0000 (12 08:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2018 12:17:42 +0000 (12 08:17 -0400)
treed0c2c87286adab5814ddb6040ace86999199bad7
parentaffbe376f9a15c7c839287b8127d3bd9ac2eab02
parentd6779a9013f2a4ca3073a5282323513606e36d20
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
.appveyor.yml