[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket21037'

[nickm@xxxxxxxxxxxxxx]

commit 4f1a5da47380da752a7fc661826a5fc723a83630
Merge: 99cbadf 6aac6c6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 11 09:17:21 2017 -0500

    Merge remote-tracking branch 'public/ticket21037'

 changes/ticket21037        |  4 ++++
 src/common/crypto_format.c | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits