commit 967cef2f8f5ad654aa0d53e1516fd26bc18a00e8 Merge: a78504dbe e70cf8262 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:48:19 2018 -0400
Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
.appveyor.yml | 4 +++- changes/bug27460 | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-)