Nick Mathewson caf28519d9 Merge branch 'bug12844' ...

Conflicts:
	src/or/circuituse.c
	src/test/include.am
	src/test/test_entrynodes.c

2015-02-11 15:06:04 -05:00

..

bug13796

changes file for 13796

2015-02-05 22:54:34 -05:00

bug13993

Avoid logging startup messages twice

2015-02-06 21:34:21 +01:00

bug14184

Control: getinfo entry-guards report down-since

2015-02-06 16:06:20 -05:00

bug14764

Fix scheduler compilation on targets where char is unsigned.

2015-02-06 16:26:28 +00:00

bug14802

Return 0 when detecting the amount of memory fails

2015-02-09 02:06:18 +00:00

bug14819

Re-remove the --disable-threads configure option

2015-02-09 10:36:59 +01:00

feature12844

Add changes file for Tor2webRendezvousPoints.

2014-09-15 16:07:48 +03:00

feature_13555

Bump the minimum relay version to 0.2.4.18-rc

2015-02-04 13:27:56 -05:00