[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug5018_notice'

[nickm@xxxxxxxxxxxxxx]

commit df836b45b068ecf4116c7b56898a3786893bce82
Merge: def0cac cc1bb19
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Mar 12 11:10:51 2014 -0400

    Merge remote-tracking branch 'asn/bug5018_notice'

 changes/bug5018 |    4 ++++
 src/or/config.c |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)



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