Merge branch 'maint-0.3.0' into maint-0.3.1

Browse Source

This is an "ours" merge to avoid taking any changs from maint-0.3.0:
we don't want to take the travis file, since there is a separate branch
for putting it in 0.3.1 and later.

...

This commit is contained in:

Nick Mathewson 2017-07-26 15:37:53 -04:00

parent 431c8d09ee cc4c1840a6

commit 1a907c6593

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