Merge remote-tracking branch 'origin/patches-2.0'

Browse Source

This is an "ours" commit: I'm not taking the recent autotools changes
from patches-2.0, since they'd conflict with master.

...

This commit is contained in:

Nick Mathewson 2013-02-08 22:09:00 -05:00

parent 2901542714 a55514eeed

commit d670e3bd35

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