]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Feb 2014 17:44:58 +0000 (12:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Feb 2014 17:44:58 +0000 (12:44 -0500)
commit87fb1e324c1b3214765c46bec3d9ec6adc3fa83d
tree000e1e6d7d42f160bbd77aaf786a65971696ef19
parent10d4d3e2d58f94418ca9554aee251232bbaaab99
parent05d8111eedee9e11e4bb1c42e93ae2fc168d52ec
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2

Conflicts:
src/or/circuitlist.c
doc/tor.1.txt
src/or/buffers.c
src/or/buffers.h
src/or/circuitlist.c
src/or/config.c
src/or/or.h
src/or/relay.c