DirPortFrontPage should serve the 'tor-exit-notice' static page
rather than tor's man page.
Merge pull request #1 from irregulator/bug/5241

DirPortFrontPage should serve the 'tor-exit-notice' static page
address puppet 3.x deprecation warnings
Merge remote-tracking branch 'githubmirror/master'
Merge remote-tracking branch 'shared/master'
Merge remote-tracking branch 'github/master'

Conflicts:
	templates/torrc.global.erb
fix variable