Merge branch 'bug22895_027' into maint-0.2.9
commit1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Nov 2017 01:35:59 +0000 (13 20:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Nov 2017 01:35:59 +0000 (13 20:35 -0500)
treeb1aba133b3c7697fcb5d29ec2f0fbf23efde8c5b
parent543fd89fb7fe4817b5e59beb132f5331ee7a2f48
parent89c0a00a9ac12082970d4e5752d4392fd03c95f3
Merge branch 'bug22895_027' into maint-0.2.9