sengler/tor-parallel-relay-conn @ 24a2352d56d807320c45fcdd8c74435bda4302c2

George Kadianakis 130eb227ac Merge branch 'tor-github/pr/1043'		5 éve
..
crypto	3835a3acf5 sendme: Properly record SENDMEs on both edges	5 éve
mainloop	338cfb3179 Merge branch 'tor-github/pr/1002'	5 éve
or	fcd51fd49f Tests for deciding how full our relay cells should be	5 éve
proto	a49f506e05 Split all controller events code into a new control_events.c	5 éve
include.am	94914e2a4d trivial whitespace fixes	5 éve