[net/toxic-git] update to the point when patches were accepted upstream