Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
commit68dea082e728094e393ee7629854e5e8ad9bbe32
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:46:26 +0000 (23 08:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:46:26 +0000 (23 08:46 -0400)
treeda6ab1b4c91404d2fccff02fa7922208aa93a7f6
parent43ebe54a24d3210ef037f7e2b67fad9597361bab
parentf367453cb5a9ea5cb0d5664425256d7abbcbb407
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9