Merge branch 'ticket_27861'
commit09223ad83b09e75494863bacb3f8004c945ef015
authorNick Mathewson <nickm@torproject.org>
Thu, 27 Sep 2018 20:24:47 +0000 (27 16:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 27 Sep 2018 20:24:47 +0000 (27 16:24 -0400)
tree2b7b99397499e06e85758e2c1ab7d4264ea3991f
parentde0b07c634c45297bad794567cb44ab91988b0ca
parentd0b2b5a20269c050d5346a869940b55ff2add190
Merge branch 'ticket_27861'