; Merge from origin/emacs-25
commit6a03b47f81c5a8f44d7bc524fce93d6f63dc4d08
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2016 22:31:06 +0000 (19 14:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2016 22:31:06 +0000 (19 14:31 -0800)
tree33e7b6bdb654b45ebeed805f48b1324b2ab038ec
parentc61ee94959ba96b2a327df0684593f7e569e30be
parenta37c08d524db722063111329458dc8f4368c46a2
; Merge from origin/emacs-25

The following commit was skipped:

a37c08d Speed up initialization by preferring /dev/urandom to GnuTLS