Merge branch 'maint-0.2.6' into maint-0.2.7

Browse Source

This is an "ours" merge to avoid conflicts on the authority list:
the 0.2.7 branch already has the tonga->bifroest merge.

...

This commit is contained in:

Nick Mathewson 2017-02-07 09:20:13 -05:00

parent 115cefdeee c6f2ae514e

commit 0a43134009

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