Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source

Use "ours" strategy to avoid taking 73a0bb16b9
from 0.2.4.  We _do_ want to keep torrc.sample.in changes in 0.2.5.

...

This commit is contained in:

Nick Mathewson 2013-10-09 12:07:01 -04:00

parent 882fb8383d 73a0bb16b9

commit 0e3cf3ebf8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available