Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9
commite2c881487cab57b1b4301560f10b4e3ff4a44167
authorNick Mathewson <nickm@torproject.org>
Mon, 21 Nov 2016 17:40:08 +0000 (21 12:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 21 Nov 2016 17:40:08 +0000 (21 12:40 -0500)
treebedc9cf5ab88724b689a174fa0aeb15642112db3
parent8a767ba7fbeedb3d8838ccfe57583203b783241d
parentf12aad7f09a608a803b74315213f6f57c97737de
Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9