Merge branch 'bug22915_029_2' into maint-0.2.9
commit6d3c5b8fb5784240232a9265049b9e1660270df7
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jul 2017 16:53:13 +0000 (26 12:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jul 2017 16:53:13 +0000 (26 12:53 -0400)
tree5276f285f409a4c158bb76edf7f7f83e393c0d95
parent3a7d757140c344986fba5769b47dc10d925fe119
parentfca1934c88f1238a43d0bea5b06cea4fd15e7b93
Merge branch 'bug22915_029_2' into maint-0.2.9