Merge branch 'log_domains' into maint-0.2.2
commit9d5873cdaedf5bbae50bec08bb0719a1a5be403d
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 18:01:02 +0000 (22 13:01 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 18:01:02 +0000 (22 13:01 -0500)
treea421e78f14aa53dfce417d48696f57d4b69e0b9c
parent613073e449c22ad3583e406e48cf5ada395489f0
parentce149c10227bd4d65bfa62898e729430981328c1
Merge branch 'log_domains' into maint-0.2.2
doc/tor.1.txt
src/or/config.c
src/or/or.h