Public Git Hosting - tor.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3930ffd cb92d47)

commit	2bcd264a28e2d6bec1e806e779bf82435c9c7505
author	Nick Mathewson <nickm@torproject.org>
	Fri, 16 Feb 2018 14:48:11 +0000 (16 09:48 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 16 Feb 2018 14:48:11 +0000 (16 09:48 -0500)
tree	a134a572dd26adf0bef4cf6f2fad56b21c0032b4	tree \| snapshot (tar.gz zip)
parent	3930ffdf63425c344e14c45cff6780108cfa038b	commit \| diff
parent	cb92d47deca15c44dd52cad6fc326520648c632e	commit \| diff

Merge branch 'maint-0.2.9' into maint-0.3.1

26 files changed:

doc/tor.1.txt	diff1 \|	diff2 \|	blob \| history
src/common/address.c	diff1 \|	diff2 \|	blob \| history
src/common/address.h	diff1 \|	diff2 \|	blob \| history
src/common/include.am	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/channeltls.c	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/nodelist.c	diff1 \|	diff2 \|	blob \| history
src/or/nodelist.h	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/relay.c	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