Use a version of execjs compatible with Ruby 1.8
Merge branch '3-2-sec' into 3-2-stable
Regenerate sid when sbdy tries to fixate the session

Fixed broken test.

Thanks Stephen Richards for reporting.
Merge branch '3.2.20' into 3-2-stable

* 3.2.20:
  bumping version to 3.2.20
  FileHandler should not be called for files outside the root
correctly escape backslashes in request path globs

Conflicts:
	actionpack/lib/action_dispatch/middleware/static.rb

make sure that unreadable files are also not leaked

CVE-2014-7829
bumping version for relesase
Merge branch '3-2-stable' into actionmailer_smtp