+145
−0
+16
−2
+1
−1
+9
−0
Loading
* debian-merge: (97 commits) Do not try to install non-existing specs New upstream version bump to 0.2.2.23-alpha 0.2.2.23-alpha blurb fold in further changes files move to march 2011 geoip file fold in the latest changes files steps roger takes when making a new release update spec locations Avoid crash in any_pending_bridge_descriptor_fetches make nickm's proposed convention from 2003 be gospel Oops, here's the *REAL* fix for the ipv6 issue changes file for careful_with_all_descs Revert "Disallow reject6 and accept6 lines in descriptors" exit_policy_is_general_exit is IPv4 only; it should admit it. Changes file for ipv6 parsing issue Disallow reject6 and accept6 lines in descriptors Fix setting target port in get_interface_address6 Fix connect() failures in get_interface_address6() Do not serve encrypt-only descriptors with the "all" request. Reported by piebeer ...