user/andrea/tor/changes, branch bug6028Andrea's tor repositoryAlways set *socket_error to something appropriate when returning -1 from connection_connect()2012-06-15T23:53:32+00:00Andrea Shepardandrea@persephoneslair.org2012-06-15T23:53:32+00:001f7f10e4f3953244a1262f46b726bbe43d025c1a
fold in changes files so far2012-06-12T08:21:39+00:00Roger Dingledinearma@torproject.org2012-06-12T08:21:39+00:002294d16113e65a935cb07aa4a1f918b3bdf73d44
Call bug5452 fix a feature; note its trac number in the changes file2012-06-11T18:44:08+00:00Nick Mathewsonnickm@torproject.org2012-06-11T18:44:08+00:00b44cb4aef8e76131c59a9e8647936bd9d2cf6e18
Add change file for 54522012-06-11T18:17:59+00:00Andrea Shepardandrea@persephoneslair.org2012-06-11T18:17:59+00:00997ed7807b187d7b12ec219c876215d9b29e1e06
Merge remote-tracking branch 'public/bug5598'2012-06-11T14:26:48+00:00Nick Mathewsonnickm@torproject.org2012-06-11T14:26:48+00:0070910479e383806b98f15490abc5e45ceb1066d5
Conflicts:
doc/tor.1.txt
Conflict was on a formatting issue in the manpage.
Conflicts:
doc/tor.1.txt
Conflict was on a formatting issue in the manpage.
changes file and whitespace fix for bug5235 patch2012-06-08T18:33:16+00:00Nick Mathewsonnickm@torproject.org2012-06-08T18:32:09+00:008be6058d8f31e578de2ba9783b2ccb5da5ab0d9e