[tor-commits] [tor/master] Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

[nickm@xxxxxxxxxxxxxx]

commit 1df114330e6c11865f0283772395ef02359ba5a0
Merge: ab98c43 3cea86e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 17 14:51:06 2016 -0400

    Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

 changes/buf-sentinel | 11 +++++++++++
 src/or/buffers.c     | 40 ++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 8 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits