Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
commit726f238b723dfaa88df763bec7e923e99430ea87
authorNick Mathewson <nickm@torproject.org>
Thu, 3 May 2018 17:38:46 +0000 (3 13:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 May 2018 17:38:46 +0000 (3 13:38 -0400)
tree396ea6b33f03c98895aa825726b9bcf1bca92cb4
parent993e314c6f08d587480070e9f19d313b81b39a09
parent59821050982a7e1c6906de61b6742546378e569c
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1