Merge remote-tracking branch 'public/bug19466'
commitfdc2a9195686805e98e221150fa476afe2d394e9
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Aug 2016 23:37:48 +0000 (19 19:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Aug 2016 23:37:48 +0000 (19 19:37 -0400)
tree01588cd6f66562e728f6f5932003ce30c4d1e6b5
parent8f2f06c9b38015f641d0505e805a8285884f55ba
parentbe820f41a33413883b23220ec19135477ac3e67d
Merge remote-tracking branch 'public/bug19466'