commit fe0fa91164bf1f8f305fc048b472fb6445551533 Merge: f68cd4a e0dae64 Author: Roger Dingledine arma@torproject.org Date: Fri Sep 2 07:23:37 2011 -0400

Merge branch 'maint-0.2.2'

changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-)