diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 14:10:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 14:10:42 -0500 |
| commit | b7f201f74606aff1f77551449bebe8783a59733a (patch) | |
| tree | 70ac808a443977ca797e24dafcbda2705e9e9e4f /tor.spec.in | |
| parent | 46b07462ae636eae1e241d5596b3a1d80c82d7ef (diff) | |
| parent | cdc59c198a15195a113d68b2c4fbb270792da533 (diff) | |
| download | tor-b7f201f74606aff1f77551449bebe8783a59733a.tar.gz tor-b7f201f74606aff1f77551449bebe8783a59733a.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/policies.c
src/or/policies.h
Diffstat (limited to 'tor.spec.in')
0 files changed, 0 insertions, 0 deletions