commit 5d428fe9b889ea43f71aa0d5c9673de37d1ca7f0 Merge: e6ba76c 7c0ac12 Author: John M. Schanck jschanck@securityinnovation.com Date: Fri Oct 14 13:54:11 2016 -0400

Merge remote-tracking branch 'origin/master' into 269-change-kdf

control-spec.txt | 34 +++- dir-spec.txt | 20 ++- proposals/000-index.txt | 14 +- proposals/220-ecc-id-keys.txt | 8 + proposals/224-rend-spec-ng.txt | 67 ++++---- proposals/244-use-rfc5705-for-tls-binding.txt | 6 +- proposals/264-subprotocol-versions.txt | 59 ++++--- proposals/272-valid-and-running-by-default.txt | 3 +- proposals/273-exit-relay-pinning.txt | 223 +++++++++++++++++++++++++ rend-spec.txt | 4 +- tor-spec.txt | 4 +- 11 files changed, 368 insertions(+), 74 deletions(-)