commit e297b8b839d6ca68133a56f4680a28ed195cb928 Merge: 217cf40 b652790 Author: Isis Lovecruft <isis@torproject.org> Date: Wed Sep 9 21:09:11 2015 +0000 Merge remote-tracking branch 'tpo-mikeperry/oob_hmac' proposals/xxx-oob-hashmac.txt | 272 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+)