merge 3.2

diff --cc Include/object.h
Simple merge

diff --cc Modules/_datetimemodule.c
index 85c5c4de1980f3d4919c8ebf651a36373143824e,5401068cbcc4233e5730e7a057ba49ea2b833435..8f571adf3716599cf28955511cb5e8104d045dd7
--- 1/Modules/_datetimemodule.c
--- 2/Modules/datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@@ -2782,8 -2563,9 +2782,9 @@@ static Py_hash_
  generic_hash(unsigned char *data, int len)
  {
      register unsigned char *p;
 -    register long x;
 +    register Py_hash_t x;
  
+     assert(_Py_HashSecret_Initialized);
      p = (unsigned char *) data;
      x = _Py_HashSecret.prefix;
      x ^= *p << 7;

diff --cc Objects/bytesobject.c
index d63fabcc9ebb67abfc8174d78448e22d332f84f5,db93f37bacc4522856c263927fdd6b036c15eb31..62ddf2153279b9a43e9f72a1925dbcd40bb34a6d
--- 1/Objects/bytesobject.c
--- 2/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@@ -873,8 -894,9 +873,9 @@@ bytes_hash(PyBytesObject *a
  {
      register Py_ssize_t len;
      register unsigned char *p;
 -    register long x;
 +    register Py_hash_t x;
  
+     assert(_Py_HashSecret_Initialized);
      if (a->ob_shash != -1)
          return a->ob_shash;
      len = Py_SIZE(a);

diff --cc Objects/unicodeobject.c
index 467f95c444f5ddf58531b03f0d86d81293eb3555,2ec878f916a8ea3ae96661f7b13fdf1c20f623f7..b70666106d274fc475aa2eacd013942d7220f293
--- 1/Objects/unicodeobject.c
--- 2/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@@ -7671,8 -7339,9 +7671,9 @@@ unicode_hash(PyUnicodeObject *self
  {
      Py_ssize_t len;
      Py_UNICODE *p;
 -    long x;
 +    Py_hash_t x;
  
+     assert(_Py_HashSecret_Initialized);
      if (self->hash != -1)
          return self->hash;
      len = Py_SIZE(self);