sengler/tor-parallel-relay-conn @ e03db9934a0d26da0b119a2d15d51c4c658af1c8

Nick Mathewson 50b45c43eb Merge branch 'maint-0.2.9' into maint-0.3.5		5 gadi atpakaļ
..
linux-tor-prio.sh	ca6682f3f8 Fix spelling mistakes corresponding to ticket #23650	6 gadi atpakaļ
tor-exit-notice.html	1087c48d6e Hardcode the image into tor-exit-notice.html	5 gadi atpakaļ
tor.logrotate.in	9230bc7c65 Clean the contrib directory with torch and machete.	10 gadi atpakaļ