Two changes suggested by Roger Dingledine: