[tor-commits] [torspec/master] Merge remote-tracking branch 'origin/master'

2017-01-18 Thread nickm
commit f45e1626c5c6573691a06e3337fd04b5abbcb9be Merge: 32ef2f3 3681931 Author: Nick Mathewson Date: Wed Jan 18 09:27:08 2017 -0500 Merge remote-tracking branch 'origin/master' control-spec.txt | 4 ++-- dir-spec.txt | 1 + 2 files changed, 3 insertions(+), 2

[tor-commits] [torspec/master] Merge remote-tracking branch 'origin/master' into 269-change-kdf

2016-10-14 Thread isis
commit 5d428fe9b889ea43f71aa0d5c9673de37d1ca7f0 Merge: e6ba76c 7c0ac12 Author: John M. Schanck Date: Fri Oct 14 13:54:11 2016 -0400 Merge remote-tracking branch 'origin/master' into 269-change-kdf control-spec.txt | 34 +++-