Public Git Hosting - tor.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a633baf 501fc3b)

commit	97337844b7282946dda12f59bcabc097fad42647
author	Nick Mathewson <nickm@torproject.org>
	Mon, 26 Sep 2016 18:00:08 +0000 (26 11:00 -0700)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 26 Sep 2016 18:00:08 +0000 (26 11:00 -0700)
tree	4ab018e139937eadfe79778f1c3e2f8fc2068e68	tree \| snapshot (tar.gz zip)
parent	a633baf6320291b6f3de15557438682ed7fe2eaa	commit \| diff
parent	501fc3bbc6e6e4003c99b0bfd95deb06b2df9580	commit \| diff

Merge branch 'protover_v2_squashed'

src/or/dirvote.c	diff1 \|	diff2 \|	blob \| history
src/or/dirvote.h	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/router.c	diff1 \|	diff2 \|	blob \| history
src/test/include.am	diff1 \|	diff2 \|	blob \| history
src/test/test.h	diff1 \|	diff2 \|	blob \| history
src/test/test_dir.c	diff1 \|	diff2 \|	blob \| history

The Onion Router