commit b8ceb464e5949b07ba9bd007002a49f3ab9c600b
Merge: 0c04416 6606e67
Author: Nick Mathewson <[email protected]>
Date: Mon Mar 10 14:08:38 2014 -0400
Merge branch 'bug11156_squashed'
changes/bug11156 | 5 +++++
src/or/microdesc.c | 2 +-
src/or/networkstatus.c | 36 ++++++++++++++++++++++++++++++------
src/or/networkstatus.h | 2 +-
src/or/nodelist.c | 8 ++++----
src/or/routerlist.c | 6 +++---
6 files changed, 44 insertions(+), 15 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
