| commit | dfa6cde4d4de57476ea8381199dfbac1afc245d5 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Wed, 7 Sep 2011 18:43:06 +0000 (7 14:43 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Wed, 7 Sep 2011 18:43:06 +0000 (7 14:43 -0400) | ||
| tree | 73b8f1ecac21bfad33f43c7759e5dfecf43361bc | treesnapshot (tar.gz zip) |
| parent | 5f9cdee8afd3fb0db835c19993fae476e0f00033 | commitdiff |
| parent | f45261cb29504bfe39ddb96d8e7f38bb32dd37a5 | commitdiff |
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
| doc/tor.1.txt | diff1 | diff2 | blobhistory |
| src/or/config.c | diff1 | diff2 | blobhistory |
| src/or/dirserv.c | diff1 | diff2 | blobhistory |
| src/or/or.h | diff1 | diff2 | blobhistory |