Nick Mathewson e969d9c6b4 Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged %!s(int64=5) %!d(string=hai) anos
..
crypto 98ef3e82e4 Move the non-crypto parts of onion.c out of src/core/crypto %!s(int64=5) %!d(string=hai) anos
mainloop e969d9c6b4 Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged %!s(int64=5) %!d(string=hai) anos
or b915b6cd21 Merge remote-tracking branch 'github/prop297' %!s(int64=5) %!d(string=hai) anos
proto f6b8c7da66 Move buffers.c out of lib/containers to resolve a circularity. %!s(int64=5) %!d(string=hai) anos
include.am 1fe6507d29 Split bootstrap event reporting out of control.c %!s(int64=5) %!d(string=hai) anos