Nick Mathewson 626a8b60d7 Merge remote-tracking branch 'linus/bug5053-bug5055' ...

Conflicts:
	src/or/geoip.c

2012-11-04 21:44:31 -05:00

..

5053

Changes files for tickets 5053 and 5055.

2012-10-22 13:41:00 +02:00

5055

Changes files for tickets 5053 and 5055.

2012-10-22 13:41:00 +02:00

bsd_queue

Add a copy of OpenBSD's sys/queue.h as tor_queue.h

2012-10-12 17:18:14 -04:00

bug7235

changes file for bug 7235

2012-10-28 10:58:26 -04:00

ewma_policy_c99

Avoid c99 designated initializers in circuitmux_ewma.c

2012-11-02 13:14:39 -04:00