sengler/tor-parallel-relay-conn @ fae4d3d9250ecc6cd34a70b642009bf8923a51f4

Nick Mathewson d95d988946 Merge branch 'feature_20956_029'		9 lat temu
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	11 lat temu
feature20956	83307fc267 Add __SocksPort etc variants for non-persistent use	9 lat temu