Merge remote-tracking branch 'tor-github/pr/665'
commit6927e9a60ca12fa67d6a33044c2903ce95ca1605
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:56:48 +0000 (19 11:56 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:56:48 +0000 (19 11:56 -0500)
tree9a3bd93c6797c90548a864719800971676a04913
parent0fc5fdc430968a62a0310fc7022c4562b4625bf2
parent00fff96e4884e295a767532aa570abf8d27e75ee
Merge remote-tracking branch 'tor-github/pr/665'