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

[nickm@xxxxxxxxxxxxxx]

commit 32d9cea2892f79d8f16adcc5ae417980af33f082
Merge: 5511d21 414adb2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Sep 17 10:50:48 2012 -0400

    Merge remote-tracking branch 'public/bug6853'

 changes/bug6853      |    3 +++
 src/or/routerparse.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

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