commit e270a066a6262784be317f003f6102430db24880
Merge: 8b4195f f8960ea
Author: Nick Mathewson <[email protected]>
Date: Sun Mar 10 23:01:58 2013 -0400
Merge remote-tracking branch 'arma/bug6783_big_hammer' into maint-0.2.4
changes/6783_big_hammer | 6 ++++++
src/or/config.c | 5 +++++
src/or/directory.c | 13 +++++++++++++
src/or/or.h | 11 +++++++++++
4 files changed, 35 insertions(+), 0 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
