[or-cvs] [tor/master] Fix another instance of "128" in buffers.c. More bug2330.

[nickm@xxxxxxxxxxxxxx]

commit b27f5cc50d4a66bff31e43a596eb296a1b5a11dc
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Jan 15 10:23:58 2011 -0500

    Fix another instance of "128" in buffers.c.  More bug2330.
---
 src/or/buffers.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index de0c219..9a30a7b 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1670,7 +1670,7 @@ fetch_from_buf_socks_client(buf_t *buf, int state, char **reason)
   if (buf->datalen < 2)
     return 0;
 
-  buf_pullup(buf, 128, 0);
+  buf_pullup(buf, MAX_SOCKS_MESSAGE_LEN, 0);
   tor_assert(buf->head && buf->head->datalen >= 2);
 
   data = (unsigned char *) buf->head->data;

From b7b01d963af19497df2d23fd558ff408a12a669b Mon Sep 17 00:00:00 2001
Patch-Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Subject: [tor/master] Merge remote branch 'origin/maint-0.2.2'

commit b7b01d963af19497df2d23fd558ff408a12a669b
Merge: 10d385b b27f5cc
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Jan 15 10:26:44 2011 -0500

    Merge remote branch 'origin/maint-0.2.2'