Merge branch 'buf_sentinel_026_v2' into maint-0.2.8
commit1df114330e6c11865f0283772395ef02359ba5a0
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Oct 2016 18:51:06 +0000 (17 14:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Oct 2016 18:51:06 +0000 (17 14:51 -0400)
tree2091d0521d784bcdec813dd0e517e2daa1ff5524
parentab98c4387eadf380f6fe71b8dc1b568704a379ea
parent3cea86eb2fbb65949673eb4ba8ebb695c87a57ce
Merge branch 'buf_sentinel_026_v2' into maint-0.2.8
src/or/buffers.c