merge 3.4 (#24963)

diff --cc Doc/library/ipaddress.rst
index 7b594408c878d5cb2a529b8790312fa09551440d,301048ef6aeb3875718f721c2df720d740df621d..90fcc748e761d052b81a88f838295c737dd3e9bb
--- 1/Doc/library/ipaddress.rst
--- 2/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@@ -575,14 -550,9 +575,14 @@@ so to avoid duplication they are only d
        single-address network, with the network address being *address* and
        the mask being ``/128``.
  
-    3. An integer packed into a :class:`bytes` object of length 16, bit-endian.
+    3. An integer packed into a :class:`bytes` object of length 16, big-endian.
        The interpretation is similar to an integer *address*.
  
 +   4. A two-tuple of an address description and a netmask, where the address
 +      description is either a string, a 128-bits integer, a 16-bytes packed
 +      integer, or an existing IPv4Address object; and the netmask is an
 +      integer representing the prefix length.
 +
     An :exc:`AddressValueError` is raised if *address* is not a valid IPv6
     address.  A :exc:`NetmaskValueError` is raised if the mask is not valid for
     an IPv6 address.