[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug6362'

[nickm@xxxxxxxxxxxxxx]

commit 6f7dbd3d34fbc476721a64c7c5f5e241ec49b906
Merge: 6864a44 5671586
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Aug 27 09:50:22 2012 -0400

    Merge remote-tracking branch 'linus/bug6362'

 changes/bug6362 |    3 +++
 src/or/router.c |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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