commit a8219b9406daa19b97ceb7e9975365659c805cc3 Merge: 0f11e4f 71609c1 Author: Roger Dingledine arma@torproject.org Date: Sat Apr 16 19:22:03 2011 -0400

Merge remote-tracking branch 'asn/gitorious'

proposals/180-pluggable-transport.txt | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)