commit a321f8f4af01b6ca2f1a809b9c484c9fdb40d177 Merge: 7700b99fe 508645b5a Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 2 10:01:30 2017 -0400

Merge branch 'buf_for_stringbuffer_squashed'

changes/ticket22342 | 3 ++ src/common/buffers.c | 69 +++++++++++++++++++++++++++ src/common/buffers.h | 7 +++ src/or/connection.c | 130 ++++++++++++++++++++++++++++++++++++--------------- src/or/connection.h | 1 + src/or/directory.c | 44 ++++++----------- src/or/geoip.c | 22 ++++----- 7 files changed, 197 insertions(+), 79 deletions(-)