Nick Mathewson 7ea904cbc0 Merge branch 'bug7011' ...

Conflicts:
	src/or/circuitbuild.c

The conflict was trivial, since no line of code actually changed in
both branches: There was a fmt_addr() that turned into fmt_addrport()
in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
master.

2012-10-10 22:31:06 -04:00

..

6757

Have node_get_pref_orport() return an IPv6 OR port when UseBridges is set.

2012-09-19 17:18:06 +02:00

6982

Add autoconf magic to support Bitrig

2012-10-04 10:56:33 -04:00

bug6465

Add changes file for channels (ticket 6465)

2012-10-08 03:06:09 -07:00

bug6816

Add changes file for bug6816

2012-10-10 00:51:55 -07:00

bug7011

Fix changes/bug7011 slightly

2012-10-10 22:27:52 -04:00

bug7014

Don't call fmt_addr() twice in a parameter list.

2012-10-09 23:49:56 -04:00

bug7022

properly free the return values of rate_limit_log()

2012-10-03 13:15:27 -04:00

bug7037

Refuse extra create cells with reason "resource limit"

2012-10-03 20:17:37 -04:00

bug7038

Downgrade "Failed to hand off onionskin" messages

2012-10-05 13:35:13 -04:00

bug7039

pass the reason from the truncated cell to the controller

2012-10-03 23:56:34 -04:00

dropped_openssl_vers

Drop support for openssl 0.9.7

2012-09-12 19:25:58 -04:00

ticket5749

add faravahar as our ninth v3 dir auth

2012-09-22 09:10:37 -04:00

ticket6997

The --version option should imply --quiet.

2012-10-01 11:01:18 -04:00

warn-about-hses-without-guards

Warn if HSes are configured on a client with UseEntryGuards disabled

2012-09-18 16:50:00 -04:00