Public Git Hosting - tor.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 616cbb3 fcbd65b)

commit	350181529e39c5b9dcec7f1ae7edf15946fee501
author	Nick Mathewson <nickm@torproject.org>
	Tue, 15 Dec 2009 22:26:09 +0000 (15 17:26 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 15 Dec 2009 22:26:09 +0000 (15 17:26 -0500)
tree	e6d9f2c537db3f03c0a3d9791b178dae5f1b7782	tree \| snapshot (tar.gz zip)
parent	616cbb31c72a95408d018fd937f1bf3adf886a9f	commit \| diff
parent	fcbd65b45cbf203b00e6752dabc7bc5b8dffdbcf	commit \| diff

Merge branch 'safelogging2'

Conflicts:
ChangeLog

16 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
src/or/buffers.c	diff1 \|	diff2 \|	blob \| history
src/or/circuitbuild.c	diff1 \|	diff2 \|	blob \| history
src/or/circuitlist.c	diff1 \|	diff2 \|	blob \| history
src/or/circuituse.c	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/connection.c	diff1 \|	diff2 \|	blob \| history
src/or/connection_edge.c	diff1 \|	diff2 \|	blob \| history
src/or/connection_or.c	diff1 \|	diff2 \|	blob \| history
src/or/control.c	diff1 \|	diff2 \|	blob \| history
src/or/dns.c	diff1 \|	diff2 \|	blob \| history
src/or/main.c	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/rendclient.c	diff1 \|	diff2 \|	blob \| history
src/or/rendcommon.c	diff1 \|	diff2 \|	blob \| history
src/or/rendservice.c	diff1 \|	diff2 \|	blob \| history

The Onion Router