git.ipfire.org Git - thirdparty/tor.git/commit

]> git.ipfire.org Git - thirdparty/tor.git/commit

projects / thirdparty / tor.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 738a8c6 36e201d)

author	Nick Mathewson <nickm@torproject.org>
	Fri, 1 Jul 2016 19:29:05 +0000 (15:29 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 1 Jul 2016 19:29:05 +0000 (15:29 -0400)
commit	aaa31290431ea2cd1d1e8498dbe271eb53d2389d
tree	d7ff38ffee26c5ab4571f089e8cf06d9e687a14c	tree \| snapshot
parent	738a8c655a1f8067b330b132164fa8879ef102c3	commit \| diff
parent	36e201dffc5d57d92113e1e68ad4b6a0a7b3471e	commit \| diff

Merge remote-tracking branch 'dgoulet/ticket16943_029_05-squashed'

Trivial Conflicts:
src/or/or.h
src/or/routerparse.c

14 files changed:

doc/tor.1.txt	diff1 \|	diff2 \|	blob \| history
src/common/util.c	diff1 \|	diff2 \|	blob \| history
src/common/util.h	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/directory.c	diff1 \|	diff2 \|	blob \| history
src/or/dirvote.c	diff1 \|	diff2 \|	blob \| history
src/or/main.c	diff1 \|	diff2 \|	blob \| history
src/or/networkstatus.c	diff1 \|	diff2 \|	blob \| history
src/or/networkstatus.h	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/routerlist.c	diff1 \|	diff2 \|	blob \| history
src/or/routerlist.h	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	diff1 \|	diff2 \|	blob \| history
src/test/test_dir.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://git.torproject.org/tor.git