Merge branch 'ticket31552_041' into maint-0.4.1
commitab74c3560a423227fff337b1033716920920603b
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:54:05 +0000 (17 18:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:54:05 +0000 (17 18:54 -0400)
treec39758ebe6e470d09ed02ec0c18ba1868810f64c
parent0891a31ad32d0567fbc8f73a0598925cb543d699
parentfb0e8966f00c4349602594f312dae60cad2ea11d
Merge branch 'ticket31552_041' into maint-0.4.1