[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug16343-master-key-assert'

[nickm at torproject.org]

commit a60d9023c34a2c77b2211bb213b165a0e5bd4439
Merge: 95bcd2d e870f62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 10 12:40:32 2015 -0400

    Merge remote-tracking branch 'teor/bug16343-master-key-assert'

 src/common/tortls.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)