From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 22:23:10 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2682
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9650e970d9f515b4b64bd0009d28125b4276b63;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

35cbe20 src/process.c Correctly convert AF_INET6 addresses
---

a9650e970d9f515b4b64bd0009d28125b4276b63