The two were created in parallel around the same time.  Code tends to use with one or the other.  I'm slightly mystified that the system is working as well as it does.
 
-These need to be unified.  Mixed mode is going to require advertising at least 2 different addresses simultaneously, and connection attempts may want to try both.  We want to be future proof against multiple addresses per protocol in the future.  This points to using Sinful as our exclusive or nearly exclusive object for passing around contact information, relegating condor_sockaddr to low level, last minute work (to take advantage of the sockaddr_in/sockaddr_in6 support.
+These need to be unified.  Mixed mode is going to require advertising at least 2 different addresses simultaneously, and connection attempts may want to try both.  We want to be future proof against multiple addresses per protocol in the future.  This points to using Sinful as our exclusive or nearly exclusive object for passing around contact information, relegating condor_sockaddr to low level, last minute work (to take advantage of the sockaddr_in/sockaddr_in6 support.  Probably keep condor_sockaddr to holding a single address.  I believe condor_sockaddr has permeated higher levels than it should have given.
 
 {section: Plan}