commit 73ba308d3d568eac81da358c4df29fda3f32e921 Merge: affbe376f d6779a901 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 08:17:42 2018 -0400

Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4

.appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)