[tor-commits] [lego/develop] Clean up and update xml stream plugin