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

[nickm@xxxxxxxxxxxxxx]

commit 90bce702ba61c3339e55cfedb4cc6f355b3049c7
Merge: e5f9f28 4235096
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 9 10:57:19 2014 -0400

    Merge remote-tracking branch 'public/bug10816'

 changes/bug10816    |    6 ++++++
 src/common/crypto.c |    6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

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