Merge branch 'thread_safe' of github.com:ruby-concurrency/concurrent-ruby into thread_safe

Conflicts:
	lib/concurrent/thread_safe.rb
	lib/concurrent/thread_safe/util.rb

Author: jdantonio

lib/concurrent/thread_safe.rb

@@ -1,6 +1,6 @@
+require 'concurrent/map'
 require 'concurrent/utility/engine'
 require 'concurrent/thread_safe/synchronized_delegator'
-require 'concurrent/map'
 require 'concurrent/thread_safe/util'
 
 module Concurrent

lib/concurrent/thread_safe/util.rb

@@ -14,9 +14,9 @@ module Util
 end
 
 require 'concurrent/tuple'
+require 'concurrent/thread_safe/util/xor_shift_random'
 require 'concurrent/thread_safe/util/volatile'
 require 'concurrent/thread_safe/util/striped64'
 require 'concurrent/thread_safe/util/adder'
 require 'concurrent/thread_safe/util/cheap_lockable'
 require 'concurrent/thread_safe/util/power_of_two_tuple'
-