]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug2850' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 16 May 2011 15:10:17 +0000 (11:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 May 2011 15:10:17 +0000 (11:10 -0400)
commit919bf6ff3cfb1387f3f9ecf9ce97d8e95e330a05
treefc97fd2ab704b34fa6575dc71fcf356048071b09
parent83fe07d3f26aff703230305c9ff529592af32d4f
parentaba7bb705a69697ade1cff24e6693db2cb87236a
Merge remote-tracking branch 'public/bug2850' into maint-0.2.2

Fixed a trivial conflict where this and the ControlSocketGroupWritable
code both added different functions to the same part of connection.c.

Conflicts:
src/or/connection.c
src/or/connection.c