Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8
commit33841a60303ce8febf8180829a868dcc43924d77
authorNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 20:04:56 +0000 (19 16:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 20:04:56 +0000 (19 16:04 -0400)
treeb6659106946214140b2d7f2582f5ee869d5c140e
parent0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3
parent2d21f03cdcf759e434b5f82abe9bd285c37004ff
Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8