Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Browse Source

Use "ours" strategy" to avoid taking bug2402 fix.

...

This commit is contained in:

Nick Mathewson 2011-02-22 15:57:36 -05:00

parent 4f730e4f3f 7605985b3f

commit 84cdcc68a9

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