Public Git Hosting - tor.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 03ab24b 9aca7d4)

commit	cd81403cc0d73d53cb7f3650b38d49c54100af25
author	David Goulet <dgoulet@torproject.org>
	Tue, 30 Jan 2018 14:33:12 +0000 (30 09:33 -0500)
committer	David Goulet <dgoulet@torproject.org>
	Tue, 30 Jan 2018 14:33:12 +0000 (30 09:33 -0500)
tree	5ea4f0c626ad082fb195a478614f67dff1a7b386	tree \| snapshot (tar.gz zip)
parent	03ab24b44cd148263cfb2b801cba35489e3852c1	commit \| diff
parent	9aca7d47306222f2870ec16a7291a8215d6c3316	commit \| diff

Merge branch 'ticket24902_029_05' into ticket24902_033_02

19 files changed:

doc/tor.1.txt	diff1 \|	diff2 \|	blob \| history
src/common/log.c	diff1 \|	diff2 \|	blob \| history
src/common/torlog.h	diff1 \|	diff2 \|	blob \| history
src/or/channel.c	diff1 \|	diff2 \|	blob \| history
src/or/channel.h	diff1 \|	diff2 \|	blob \| history
src/or/command.c	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/connection.c	diff1 \|	diff2 \|	blob \| history
src/or/geoip.c	diff1 \|	diff2 \|	blob \| history
src/or/geoip.h	diff1 \|	diff2 \|	blob \| history
src/or/include.am	diff1 \|	diff2 \|	blob \| history
src/or/main.c	diff1 \|	diff2 \|	blob \| history
src/or/networkstatus.c	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/rendmid.c	diff1 \|	diff2 \|	blob \| history
src/or/status.c	diff1 \|	diff2 \|	blob \| history
src/test/include.am	diff1 \|	diff2 \|	blob \| history
src/test/test.c	diff1 \|	diff2 \|	blob \| history
src/test/test.h	diff1 \|	diff2 \|	blob \| history

The Onion Router