]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
authorNick Mathewson <nickm@torproject.org>
Tue, 4 Mar 2014 16:00:02 +0000 (11:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 4 Mar 2014 16:00:02 +0000 (11:00 -0500)
commitbb375442141b4a5b301212394ce3e106cb34daf2
tree96a5baed08b8212b1b719e8ad72507d76e34bb99
parentc8d41da52d6ae1edd1c4999e328b1e7eadc0ab5b
parent46118d7d7542aa960a26a08d9d5fbac33698765c
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2

Conflicts:
src/common/compat_libevent.h
src/or/relay.c
src/common/compat_libevent.c
src/common/compat_libevent.h
src/or/buffers.c
src/or/circuitlist.c
src/or/relay.c