Nick Mathewson
|
c35c43d7d9
|
Merge branch 'ticket17238_029_02-resquash'
Conflicts:
src/or/rendclient.c
src/or/rendcommon.c
src/or/routerparse.c
src/test/test_dir.c
src/trunnel/ed25519_cert.h
|
2016-11-04 13:26:37 -04:00 |
|
George Kadianakis
|
d795ed5871
|
Make check-spaces happy :)
Signed-off-by: David Goulet <dgoulet@torproject.org>
Signed-off-by: George Kadianakis <desnacked@riseup.net>
|
2016-11-04 10:32:50 -04:00 |
|
David Goulet
|
cff1fd63f1
|
prop224: Descriptor decoding implementation
Closes #18571
Signed-off-by: David Goulet <dgoulet@torproject.org>
Signed-off-by: George Kadianakis <desnacked@riseup.net>
|
2016-11-04 10:29:28 -04:00 |
|
David Goulet
|
e8c12175fe
|
Move token parsing code to parsecommon.{c|h}
Signed-off-by: David Goulet <dgoulet@torproject.org>
Signed-off-by: George Kadianakis <desnacked@riseup.net>
|
2016-11-04 10:29:26 -04:00 |
|