commit 8ca3773f686c43328f3c05a35d4d0e61a30b980c Author: Nick Mathewson nickm@torproject.org Date: Tue May 26 10:24:21 2015 -0400

Fix unit tests on MSVC2013.

Patch from "NewEraCracker." Fixes bug16030; bugfix on 0.2.6.2-alpha. --- changes/bug16030 | 3 +++ src/test/test_channel.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug16030 b/changes/bug16030 new file mode 100644 index 0000000..c14fd62 --- /dev/null +++ b/changes/bug16030 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Fix a crash in the unit tests on MSVC2013. Fixes bug 16030; bugfix on + 0.2.6.2-alpha. Patch from "NewEraCracker". \ No newline at end of file diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 6cf6649..e11ac3f 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -420,6 +420,7 @@ new_fake_channel(void)

chan->close = chan_test_close; chan->get_overhead_estimate = chan_test_get_overhead_estimate; + chan->get_remote_descr = chan_test_get_remote_descr; chan->num_bytes_queued = chan_test_num_bytes_queued; chan->num_cells_writeable = chan_test_num_cells_writeable; chan->write_cell = chan_test_write_cell; @@ -615,7 +616,6 @@ test_channel_dumpstats(void *arg) /* Test channel_dump_statistics */ ch->describe_transport = chan_test_describe_transport; ch->dumpstats = chan_test_dumpstats; - ch->get_remote_descr = chan_test_get_remote_descr; ch->is_canonical = chan_test_is_canonical; old_count = test_dumpstats_calls; channel_dump_statistics(ch, LOG_DEBUG);