Merge branch 'maint-0.3.0'
commit02aaa7f9edd333a40d364fd99f3c141dfe85b651
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Feb 2017 16:37:41 +0000 (24 11:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Feb 2017 16:37:41 +0000 (24 11:37 -0500)
tree869639099f507f7f7b0a6fff0cb93ff6ee11fb30
parentd73755e36e83f30e9a961029b6eaba34c3935845
parent619771f60bde6b69eeaad4efbd844705ec5bcb83
Merge branch 'maint-0.3.0'