[tor-commits] [tor/master] Merge branch 'bug14478_squashed'

[nickm at torproject.org]

commit f794a091647050efa97719581f99c453b38074dd
Merge: 99e915d dfb409b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 11 15:59:41 2015 -0500

    Merge branch 'bug14478_squashed'

 src/test/zero_length_keys.sh |   47 +++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 17 deletions(-)