diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-29 21:08:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-29 21:08:26 -0400 |
| commit | 27438ef7c6a34b71165480f4d2c9173278e6d854 (patch) | |
| tree | 904107f344c26bc2e7f761157a53ff2742f724ce /.gitignore | |
| parent | 545e2119f2e96dedef2efd254632f0204f70ab76 (diff) | |
| parent | 35699ef9f5d2814203653e16cb0cd176a0190ae0 (diff) | |
| download | tor-27438ef7c6a34b71165480f4d2c9173278e6d854.tar.gz tor-27438ef7c6a34b71165480f4d2c9173278e6d854.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is
a cherry-picked backport of 9686.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions