[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/channel_free_list'

[nickm at torproject.org]

commit 2c5fec15f7542a3190e3f406820c998bdecdc5f7
Merge: 6034e21 bbb73ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 1 09:19:00 2015 -0400

    Merge remote-tracking branch 'sebastian/channel_free_list'

 changes/bug16924 |    6 ++++++
 src/or/channel.c |    1 +
 2 files changed, 7 insertions(+)