diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-09 12:07:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-09 12:07:01 -0400 |
| commit | 0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66 (patch) | |
| tree | b0337af07992d99951fe7a9bc34c20ab7160e2e0 /src/config/torrc.sample.in | |
| parent | 882fb8383da941ec8bec7a698caacd5924f25892 (diff) | |
| parent | 73a0bb16b9b750be9a51470ff57ee654787836d9 (diff) | |
| download | tor-0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66.tar.gz tor-0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Use "ours" strategy to avoid taking 73a0bb16b9b750be9a51470ff5
from 0.2.4. We _do_ want to keep torrc.sample.in changes in 0.2.5.
Diffstat (limited to 'src/config/torrc.sample.in')
0 files changed, 0 insertions, 0 deletions