Pull changes to fix getlantern/lantern#1895

Pull changes to fix getlantern/lantern#1895
Astute observation.  All goroutines need to be stopped.  Back when connCh was buffered, at least one of them also needed to drain connCh.  Now that it's unbuffered, that's no longer required, so I'm going to take that out.