commit 097a08f6fe61fcdd20bc7a5a57294fe358e68e6a Merge: ece9ef7 96c0a42 Author: Nick Mathewson <[email protected]> Date: Thu Mar 28 09:33:58 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8599 | 4 ++++
src/or/config.c | 2 +-
src/or/nodelist.c | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
