Merge branch 'bug19903_028_v2' into maint-0.2.8
commit65cf5130ef60b82bae552363bcca53e5ab9cfd02
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Aug 2016 23:35:26 +0000 (19 19:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Aug 2016 23:35:26 +0000 (19 19:35 -0400)
tree09f49f80973bc2b02f47de60df0a2731f696389b
parent459e5d705eb688642d53f38c00e0a2c6cfd36b8a
parent49843c980a07b73c9e98c7c7983e7745d5d82751
Merge branch 'bug19903_028_v2' into maint-0.2.8