net.c: Adding read and write timeouts to the tcp open. One site was connecting but then failing to send a response and hanging indefinitely.
Merge branch 'master' of hgwdev.cse.ucsc.edu:/data/git/kent
lifted uc16 and ux16 from hg18 for ultra conserved elements to view in 100-way alignment refs #10272
add hg18 lifted note and icon to the ultra conserved tracks;
added new section for UDR
New and improved Database of Genomic Variants (DGV).  It is now a
composite track as requested by the submitter, and the tables have
more columns than the older dgv tables.
The track description needs to be updated to make more clear what
DGV gets from dbVar/DGVa and what it adds.
refs #11200
Docs #8293 hgLogin password screen instructions
Change the "Current Password" UI text to "Current or Emailed Password"
Correcting typo
Emphasizing public searchable mailing list in red text refs #11597
Merge remote-tracking branch: upstream/master