Merge remote-tracking branch 'teor/bug23827-v2'
commite622f208a316cf3388003c1cdd1961eaaa8c370d
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:27:03 +0000 (12 09:27 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:27:03 +0000 (12 09:27 -0500)
treecc874db33a4fb8ce7b57f53c2bbb17e94a2eed7c
parent9c604e2bbb10f7637316f2e0e226eb4669b7f4ac
parent94ad47e332940aee3e1a04beeebac03b3803e085
Merge remote-tracking branch 'teor/bug23827-v2'