[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug18625'

commit 8d16c2f30e14ebf0e9a44c71a7e500c4381869f4
Merge: 4bb44f2 8251fe5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 25 17:19:59 2016 -0400

    Merge remote-tracking branch 'arma/bug18625'

 src/or/directory.c | 70 ++++++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 41 deletions(-)

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