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

Browse Source

Doing an "ours" merge to avoid taking 35699ef9f5, which is
a cherry-picked backport of 9686.

...

This commit is contained in:

Nick Mathewson 2014-04-29 21:08:26 -04:00

parent 545e2119f2 35699ef9f5

commit 27438ef7c6

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