[tor-commits] [tor-design-2012/master] integrate more of the guard nodes section