diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-18 22:30:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-18 22:30:02 -0400 |
| commit | e9dae1ff2e147d2b74fb1ce2836fb9c42f227af4 (patch) | |
| tree | 74e72b9a7c737110f12f4a9d4cd6b8ad30cd3bfb /changes/bug5508 | |
| parent | 4db5a1e151a7aa69f2682854b021d1f9bb0f5caf (diff) | |
| parent | 2d276ab9d9193d5152fe2599e9d39f2df9ea7d43 (diff) | |
| download | tor-e9dae1ff2e147d2b74fb1ce2836fb9c42f227af4.tar tor-e9dae1ff2e147d2b74fb1ce2836fb9c42f227af4.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/rendservice.c
Conflicts were due to new NON_ANONYMOUS_MODE_ENABLED tor2web code; I
think I resolved them correctly.
Diffstat (limited to 'changes/bug5508')
0 files changed, 0 insertions, 0 deletions