commit bbc049a7561f8247db130a7b9115ce4ff392cf99
Merge: d34d0b4 42731f6
Author: Nick Mathewson <[email protected]>
Date: Wed Apr 17 10:48:39 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8037 | 8 ++++++++
src/common/util.c | 14 ++++++++++++++
src/common/util.h | 3 +++
src/or/routerparse.c | 13 ++++++++++---
4 files changed, 35 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
