OK, this turned out to be a branch confusion. None of these patches are
relevant. :)

Take-away lessons:
* Include a user-identifier at the start of branches you are owning/with
your feature/patch.
* Make your branch stem from the origin master, and do regularly pulls to
avoid conflicts.

Added these with a bit more detail to the uproxy coding guide section on
committing code<https://docs.google.com/a/google.com/document/d/1rnaSOBbAHYvb9yXr8lyM-nkUe2FefzUWpeYZ27UKr7o/edit#heading=h.jbmhtom4zarm>
.


On Thu, Feb 13, 2014 at 2:59 PM, Serene H <notifications@github.com> wrote:

> In src/socks-to-rtc/tcp.ts:
>
> > @@ -63,10 +62,9 @@ module TCP {
> >
> >        // Default callbacks for when we create new Connections.
> >        this.connectionCallbacks = {
> > -        disconnect: null, // Called when a socket is closed
> > +        disconnect: null, // Called when a client socket is closed
>
> Actually, a bunch of this seems out of date given all the promises
> refactoring I've been doing. For one, the way callbacks work has changed a
> lot. There might be an exciting merge conflict brewing in front of us.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/uProxy/socks-rtc/pull/26/files#r9724688>
> .
>



-- 
Lucas Dixon | Google Ideas