sengler/tor-parallel-relay-conn @ 4bbefc2aac2d3770817200700e2a384d966bffe2

Nick Mathewson c3e94a8ccd Merge branch 'maint-0.4.0' into maint-0.4.1		5 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ļ