diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-20 13:55:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-20 13:55:55 -0400 |
| commit | 2fae74d6c3e84eef24d628f55898c27a2ffa23f7 (patch) | |
| tree | 7bc2237ef486d8c9ea86c2438e159c11dd3c9966 /contrib/suse | |
| parent | 452aa186800cbdeea13c9c5e40b78984db0616a1 (diff) | |
| parent | a83abcf5ee5cb8fe245bc97e089e082f62921194 (diff) | |
| download | tor-2fae74d6c3e84eef24d628f55898c27a2ffa23f7.tar tor-2fae74d6c3e84eef24d628f55898c27a2ffa23f7.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
This is an "ours" merge, taking nothing, since we already had the
changes that were in a83abcf5ee5cb8fe245bc97e0
Diffstat (limited to 'contrib/suse')
0 files changed, 0 insertions, 0 deletions