Merge remote-tracking branch 'isis/bug24612'
commit519c6ba26c31d801b73e44ca5c760044a7fe06e5
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Dec 2017 15:59:57 +0000 (15 10:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Dec 2017 15:59:57 +0000 (15 10:59 -0500)
tree698f78284bddc2b4d532aaa461475110d6743de4
parentdb4873c46d80366c8eb0df0098ba18a10c0ad59b
parentc7dc65e033a63c6ba4d4f8e195265cb845f8e05f
Merge remote-tracking branch 'isis/bug24612'