Roger Dingledine
merge the two nsf lines, since the first one was just a pass-through, and the second one isn't a pass-through (it's not via georgia tech and princeton, it's straight to us).
5cc91152c @ 2013-08-31 06:37:41