sengler/tor-parallel-relay-conn @ 8a05e1a5d2227b0333940d004b97b1c96fa9d991

Nick Mathewson df87812b41 Merge remote-tracking branch 'teor/fallbacks-20161219'		9 gadi atpakaļ
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	10 gadi atpakaļ
fallbacks-201612	53ec087450 Avoid an error in the fallback script when a fallback doesn't have any uptime	9 gadi atpakaļ