merge

diff --cc Misc/NEWS
Simple merge

diff --cc Objects/setobject.c
index e6fb46e6e24dfb61f338f9dcaaf9b0f8660ca51a,704d7e2b2a76ec2db079eb275592a76f69886937..922c61968ef3dd6c652f7b38792fc43717db4703
--- 1/Objects/setobject.c
--- 2/Objects/setobject.c
+++ b/Objects/setobject.c
@@@ -668,11 -600,15 +668,12 @@@ set_merge(PySetObject *so, PyObject *ot
      }
  
      /* We can't assure there are no duplicates, so do normal insertions */
-     for (i = 0; i <= other->mask; i++, other_entry++) {
+     for (i = 0; i <= other->mask; i++) {
+         other_entry = &other->table[i];
          key = other_entry->key;
          if (key != NULL && key != dummy) {
 -            Py_INCREF(key);
 -            if (set_insert_key(so, key, other_entry->hash)) {
 -                Py_DECREF(key);
 +            if (set_add_entry(so, key, other_entry->hash))
                  return -1;
 -            }
          }
      }
      return 0;