From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2011 00:17:17 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c170218238a38a0106acb1a7428b514ce979ca;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/circuitbuild.h
---

f2c170218238a38a0106acb1a7428b514ce979ca
diff --cc src/or/circuitbuild.h
index 33d483df87,0e673e1c05..87adb9a1e8
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@@ -63,12 -62,13 +63,13 @@@ int getinfo_helper_entry_guards(control
                                  const char *question, char **answer,
                                  const char **errmsg);
  
- void clear_bridge_list(void);
+ void mark_bridge_list(void);
+ void sweep_bridge_list(void);
 -int routerinfo_is_a_configured_bridge(routerinfo_t *ri);
 +int routerinfo_is_a_configured_bridge(const routerinfo_t *ri);
- void learned_router_identity(tor_addr_t *addr, uint16_t port,
+ void learned_router_identity(const tor_addr_t *addr, uint16_t port,
                               const char *digest);
  void bridge_add_from_config(const tor_addr_t *addr, uint16_t port,
-                             char *digest);
+                             const char *digest);
  void retry_bridge_descriptor_fetch_directly(const char *digest);
  void fetch_bridge_descriptors(or_options_t *options, time_t now);
  void learned_bridge_descriptor(routerinfo_t *ri, int from_cache);