Merge branch 'maint-0.2.7-redux' into maint-0.2.8

Browse Source

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.

...

This commit is contained in:

Nick Mathewson 2017-02-28 10:37:25 -05:00

parent f2a657c22b b5526bef38

commit f93bcab60e

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