diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-12 15:38:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-12 15:38:33 -0400 |
| commit | 79b31dd4f8b45d9c68fa33dcd564deb60a26286e (patch) | |
| tree | c35c24f1e772b2727c1f5b1744fc5e47823f41e2 /Makefile.am | |
| parent | 35e19b9498e3d23d87d7adacd4ec27969d63d315 (diff) | |
| parent | 45439bfced7f41c2e0beecb715880cb83d421618 (diff) | |
| download | tor-79b31dd4f8b45d9c68fa33dcd564deb60a26286e.tar tor-79b31dd4f8b45d9c68fa33dcd564deb60a26286e.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Use the "ours" strategy so that we retain 4aff97cfc796, which maint-0.2.3
just reverted.
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions