commit 90f6c590afbf90ffeeee8bf2b45921638b23ae32 Merge: 6e0872e86 08ad1f1e4 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 23 20:07:39 2018 -0400

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

.appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)