Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
commit0a824bd88998be66bfd8d55c7200fe3903e19739
authorNick Mathewson <nickm@torproject.org>
Wed, 31 Oct 2018 15:01:36 +0000 (31 11:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 31 Oct 2018 15:01:36 +0000 (31 11:01 -0400)
treef8cc509de4b15e11ed699053f01cb57ebc1f0084
parent0878bb961f9028a81ce465702afb891a82015228
parent939657771c7d2832fcedf51c0b250841d907e07f
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9